Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/templates/www/tuiyijunren/include/header-index.html
#	src/main/resources/templates/www/tuiyijunren/include/header.html

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

src/main/resources/static/www/tuiyijunren/images/basic.css

@@ -310,8 +310,8 @@ width: 330px;
 	text-align: left;
 	font-size: 26px;
 	font-weight: 900;
-	height: 50px;
-	line-height: 50px;
+	/*height: 50px;*/
+	/*line-height: 50px;*/
 }
 .news_txt h5{
 	font-size: 16px;
@@ -653,7 +653,7 @@ width: 330px;
 }
 /*创业服务*/
 .er_right .news_list{
-	
+
 }
 .cyfw_bm{
 	display: block;

src/main/resources/templates/www/tuiyijunren/content-dffhjd.html

@@ -1,18 +0,0 @@
-<!--头部开始-->
-@includeFileTemplate("/www/tuiyijunren/include/header.html"){}
-<!--头部结束-->
-<!--中间内容开始-->
-<div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1240.html">地方孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
-	<div class="news_txt">
-		<h1>${content.title!}</h1>
-		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>
-		<p>${content.content}</p>
-	</div>
-</div>
-<!--中间内容结束-->
-<!--底部开始-->
-@includeFileTemplate("/www/tuiyijunren/include/footer.html"){}
-<!--底部结束-->
-</body>
-</html>

src/main/resources/templates/www/tuiyijunren/content-sfhjd.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1238.html">省孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1237.html">孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/content-sjfhjd.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content">
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1239.html">市孵化基地</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a>><a href="${frontPath}/${site.siteId}/1232.html">综合服务</a>><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/content-zxdt.html

@@ -3,7 +3,7 @@
 <!--头部结束-->
 <!--中间内容开始-->
 <div class="er_content"> 
-	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}/1213.html">最新动态</a><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
+	<div class="dqwz"><span>当前位置：<a href="${frontPath}/${site.siteId}">网站首页</a><a href="${frontPath}/${site.siteId}/${category.categoryId}.html">${category.categoryName}</a></span></div>
 	<div class="news_txt">
 		<h1>${content.title!}</h1>
 		<h5><i class="laiy">来源：${content.author!}</i><i class="date">时间：${content.inputdate,dateFormat="yyyy-MM-dd"}</i></h5>

src/main/resources/templates/www/tuiyijunren/include/header-index.html

@@ -36,6 +36,8 @@
         <a href="${frontPath}/${site.siteId}/1226.html">创业服务</a>
         <a href="${frontPath}/${site.siteId}/1229.html">学历提升</a>
         <a>综合服务</a>
+        <a>学历提升</a>
+        <a href="${frontPath}/${site.siteId}/1236.html">综合服务</a>
         <a href="${frontPath}/${site.siteId}/1238.html">孵化基地</a>
         <a>合作企业</a>
         <a>证书认证</a>

src/main/resources/templates/www/tuiyijunren/include/header.html

@@ -31,6 +31,8 @@
         <a class="navi" href="${frontPath}/${site.siteId}/1226.html">创业服务</a>
         <a class="navi" href="${frontPath}/${site.siteId}/1229.html">学历提升</a>
         <a class="navi">综合服务</a>
+        <a class="navi">学历提升</a>
+        <a class="navi" href="${frontPath}/${site.siteId}/1236.html">综合服务</a>
         <a class="navi" href="${frontPath}/${site.siteId}/1238.html">孵化基地</a>
         <a class="navi">合作企业</a>
         <a class="navi">证书认证</a>
@@ -38,9 +40,10 @@
 </div>
 <script>
     let url = window.location.href;
+    let id = url.split(".html")[0].split("/")[5];
     let naviTags = document.getElementsByClassName("navi");
     for (let i = 0; i < naviTags.length; i++) {
-        if(url == naviTags[i].href){
+        if(id == naviTags[i].href.split(".html")[0].split("/")[5]){
             naviTags[i].className = "navi on";
         }else {
             naviTags[i].className = "navi";

src/main/resources/templates/www/tuiyijunren/include/page.html

@@ -17,3 +17,21 @@
     </#cms_pagination>
     </ul>
 </div>
+
+<style>
+    .page li{
+        display: inline-block;
+        font-size: 14px;
+        padding: 0px 4px;
+        border-radius: 3px;
+    }
+    .page li:hover{
+        color: #0f4c0f;
+    }
+    .current{
+        color: #0f4c0f;
+        background: rgba(0,136,53,0.29);
+    }
+</style>
+
+

src/main/resources/templates/www/tuiyijunren/index.html

@@ -76,9 +76,28 @@
         <div class="index_tit">
             <h1>职业技能培训</h1>
             <span>-1V1实操技能培训&nbsp;&nbsp;专业职业培训-</span></div>
-        <div class="flex_div"><a class="wrj"> <i></i> <span>无人机驾驶技术</span> </a> <a class="xmt"> <i></i> <span>新媒体运营</span>
-        </a> <a class="xfzs"> <i></i> <span>消防证书</span> </a> <a class="sd"> <i></i> <span>水电、水暖工人</span> </a>
-            <a class="qcxp"> <i></i> <span>汽车配修制造</span> </a></div>
+        <div class="flex_div">
+            <a class="wrj">
+                <i></i>
+                <span>无人机驾驶技术</span>
+            </a>
+            <a class="xmt">
+                <i></i>
+                <span>新媒体运营</span>
+            </a>
+            <a class="xfzs">
+                <i></i>
+                <span>消防证书</span>
+            </a>
+            <a class="sd">
+                <i></i>
+                <span>水电、水暖工人</span>
+            </a>
+            <a class="qcxp">
+                <i></i>
+                <span>汽车配修制造</span>
+            </a>
+        </div>
     </div>
     <!--职业技能培训 结束-->
     <!--退伍军人专升本 开始-->
@@ -118,12 +137,12 @@
                     <p><span>联系人：周老师</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询电话：15648958569</span></p>
                     <span>由吉林省人民政府、国家国防科技工业局和长春市人民政府共建，以光电技术为特色，入选国家“中西部高校基础能力建设工程”，计算机科学与技术等专业在省内具有较高的声誉。</span>
                 </a> <a class="more">查看详细</a></li>
-                <li aos="fade-up" aos-duration="1000"><img src="${resPath}/tuiyijunren/images/twjr_img2.png"/> <a
-                        class="text">
-                    <h5>长春理工大学</h5>
-                    <p><span>联系人：周老师</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询电话：15648958569</span></p>
-                    <span>由吉林省人民政府、国家国防科技工业局和长春市人民政府共建，以光电技术为特色，入选国家“中西部高校基础能力建设工程”，计算机科学与技术等专业在省内具有较高的声誉。</span>
-                </a> <a class="more">查看详细</a></li>
+                <!--<li aos="fade-up" aos-duration="1000"><img src="${resPath}/tuiyijunren/images/twjr_img2.png"/> <a-->
+                        <!--class="text">-->
+                    <!--<h5>长春理工大学</h5>-->
+                    <!--<p><span>联系人：周老师</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询电话：15648958569</span></p>-->
+                    <!--<span>由吉林省人民政府、国家国防科技工业局和长春市人民政府共建，以光电技术为特色，入选国家“中西部高校基础能力建设工程”，计算机科学与技术等专业在省内具有较高的声誉。</span>-->
+                <!--</a> <a class="more">查看详细</a></li>-->
             </ul>
             <div class="clearfix"></div>
             <div id="pager" class="pager"></div>

src/main/resources/templates/www/tuiyijunren/list-dffhjd.html

@@ -1,45 +0,0 @@
-<!--头部开始-->
-@includeFileTemplate("/www/tuiyijunren/include/header.html"){}
-<!--头部结束-->
-<!--中间内容开始-->
-<div class="er_content clearfix">
-    <div class="er_left fl">
-        <div class="er_nav">
-            <h4>地方孵化基地${categoryId}</h4>
-            <#cms_category_list  siteId="${site.siteId}" categoryId="1240" isNav="0" var="bean">
-                <a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
-            </#cms_category_list>
-        </div>
-    </div>
-    <div class="er_right fl">
-        <div class="news_list">
-            <#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
-                <#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="8" titleLen="24" var="bean">
-                    <a class="news_list_div clearfix" href="${bean.url!}">
-                        <img src="${bean.thumb!}" alt="${bean.title!}"/>
-                        <div class="news_list_text">
-                            <h2>${bean.title!}</h2>
-                            <h2>${bean.category.categoryId!}</h2>
-                            <span>${bean.description!}</span>
-                            <p><i class="date">${bean.inputdate,dateFormat="yyyy年MM月dd日"}</i><i class="djl">点击量：${bean.viewNum!}</i></p>
-                        </div>
-                    </a>
-                </#cms_content_list>
-            </#cms_pagination>
-        </div>
-        <div class="fenye">
-            @includeFileTemplate("/www/tuiyijunren/include/page.html"){}
-        </div>
-    </div>
-</div>
-<script>
-    $(function () {
-        let id = "${categoryId}";
-        $("#"+id).addClass("on");
-    });
-</script>
-<!--中间内容结束-->
-<!--底部开始-->
-@includeFileTemplate("/www/tuiyijunren/include/footer.html"){}
-<!--底部结束-->
-

src/main/resources/templates/www/tuiyijunren/list-sfhjd.html

@@ -5,8 +5,8 @@
 <div class="er_content clearfix">
     <div class="er_left fl">
         <div class="er_nav">
-            <h4>法律顾问${categoryId}</h4>
-            <#cms_category_list  siteId="${site.siteId}" categoryId="1238" isNav="0" var="bean">
+            <h4>孵化基地${categoryId}</h4>
+            <#cms_category_list  siteId="${site.siteId}" categoryId="1237" isNav="0" var="bean">
                 <a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
             </#cms_category_list>
         </div>

src/main/resources/templates/www/tuiyijunren/list-sjfhjd.html

@@ -5,8 +5,8 @@
 <div class="er_content clearfix">
     <div class="er_left fl">
         <div class="er_nav">
-            <h4>省孵化基地${categoryId}</h4>
-            <#cms_category_list  siteId="${site.siteId}" categoryId="1238" isNav="0" var="bean">
+            <h4>综合服务${categoryId}</h4>
+            <#cms_category_list  siteId="${site.siteId}" categoryId="1232" isNav="0" var="bean">
                 <a id="${bean.categoryId}" href="${frontPath}/${site.siteId}/${bean.categoryId}.html">${bean.categoryName}</a>
             </#cms_category_list>
         </div>
@@ -14,14 +14,15 @@
     <div class="er_right fl">
         <div class="news_list">
             <#cms_pagination siteId="${site.siteId}" categoryId="${categoryId}" page="${page}" moreNum="6" var="page">
-                <#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="8" titleLen="24" var="bean">
+                <#cms_content_list siteId="${site.siteId}" categoryId="${categoryId}" orderBy="3" isHot="0" hasChild="0" isRecommend="0" size="8" titleLen="22" var="bean">
                     <a class="news_list_div clearfix" href="${bean.url!}">
                         <img src="${bean.thumb!}" alt="${bean.title!}"/>
                         <div class="news_list_text">
                             <h2>${bean.title!}</h2>
                             <h2>${bean.category.categoryId!}</h2>
+                            <span>${bean.keywords!}</span>
                             <span>${bean.description!}</span>
-                            <p><i class="date">${bean.inputdate,dateFormat="yyyy年MM月dd日"}</i><i class="djl">点击量：${bean.viewNum!}</i></p>
+<!--                            <p><i class="date">${bean.inputdate,dateFormat="yyyy年MM月dd日"}</i><i class="djl">点击量：${bean.viewNum!}</i></p>-->
                         </div>
                     </a>
                 </#cms_content_list>