Browse Source

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 years ago
parent
commit
caab96908c

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -413,7 +413,7 @@ public class WebpageController extends BaseController {
 		}
 		}
 		//企业资质认证
 		//企业资质认证
 		JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业资质认定");
 		JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业资质认定");
-		category.setLayer(3);
+		category.setLayer(10);
 		category.setName("企业资质认定");
 		category.setName("企业资质认定");
 		if (qiyerenzheng != null) {
 		if (qiyerenzheng != null) {
 			//List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("企业资质认定", null, 12);
 			//List<JtBusinessProject> qyrzCategories = jtBusinessService.getModuleByName("企业资质认定", null, 12);

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -96,7 +96,7 @@
 						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
 						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a>
+						<!-- <a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a> -->
 						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通   </a>
 						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通   </a>
 					</p>
 					</p>
 				</li>
 				</li>

+ 6 - 6
src/main/webapp/WEB-INF/views/portal/index.html

@@ -74,7 +74,7 @@
 
 
 	<!-- 主体内容区域 -->
 	<!-- 主体内容区域 -->
 	<div class="container">
 	<div class="container">
-		<div class="indexNav">
+		<!-- <div class="indexNav">
 			<ul>
 			<ul>
 				<li>
 				<li>
 				<a th:href="@{/portal/service/patent}">
 				<a th:href="@{/portal/service/patent}">
@@ -91,13 +91,13 @@
 					<img th:src="${portalHost+'/img/index/index_icon3.png'}" alt="">
 					<img th:src="${portalHost+'/img/index/index_icon3.png'}" alt="">
 					<p>知识产权交易</p></a>
 					<p>知识产权交易</p></a>
 				</li>
 				</li>
-				<!-- <li>
+				<li>
 				<a th:href="@{/portal/service/serviceIndex}">
 				<a th:href="@{/portal/service/serviceIndex}">
 					<img th:src="${portalHost+'/img/index/index_icon4.png'}" alt="">
 					<img th:src="${portalHost+'/img/index/index_icon4.png'}" alt="">
 					<p>知识产权维权</p></a>
 					<p>知识产权维权</p></a>
-				</li> -->
+				</li>
 			</ul>
 			</ul>
-		</div>
+		</div> -->
 		<h3 class="title">热门申请</h3>
 		<h3 class="title">热门申请</h3>
 		<div>
 		<div>
 			<img th:src="${portalHost+'/img/index/index_hotBj.png'}" alt="">
 			<img th:src="${portalHost+'/img/index/index_hotBj.png'}" alt="">
@@ -231,7 +231,7 @@
 					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
 					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
 					
 					
 				</h4>
 				</h4>
-				<img th:src="(${policys[0].titleImg}==null)?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
+				<img th:src="(${policys[0].titleImg}==null or ${policys[0].titleImg} == '')?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
 				<ul>				
 				<ul>				
 					<li th:each="p,pStatus:${policys}" th:if="${pStatus.index}==0">
 					<li th:each="p,pStatus:${policys}" th:if="${pStatus.index}==0">
 						<a th:href="@{/portal/news/newsDetail(id=${p.id},type=0)}">
 						<a th:href="@{/portal/news/newsDetail(id=${p.id},type=0)}">
@@ -282,7 +282,7 @@
 					<a th:href="@{/portal/news/newsDetail(id=${sc.id},type=1)}">
 					<a th:href="@{/portal/news/newsDetail(id=${sc.id},type=1)}">
 						<div class="time">
 						<div class="time">
 							<span th:text="${#dates.format(sc.releaseDate,'MM-dd')}">03-12</span>
 							<span th:text="${#dates.format(sc.releaseDate,'MM-dd')}">03-12</span>
-								<span th:text="${#dates.format(sc.releaseDate,'yyyy')}">2018</span>
+							<span th:text="${#dates.format(sc.releaseDate,'yyyy')}">2018</span>
 						</div>
 						</div>
 						<p th:text="${sc.title}"></p>
 						<p th:text="${sc.title}"></p>
 					</a>
 					</a>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html