liliang4869 лет назад: 7
Родитель
Сommit
0fc683f735

+ 1 - 1
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -59,7 +59,7 @@ public class UserIdentityBo extends InputUserIdentity {
 	@Override
 	@Override
 	public String getHeadPortraitUrl() {
 	public String getHeadPortraitUrl() {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
-		if(getHeadPortraitUrl()!= null && !getHeadPortraitUrl().contains("."))return null;
+		if(super.getHeadPortraitUrl()!= null && !super.getHeadPortraitUrl().contains("."))return null;
 		return super.getHeadPortraitUrl();
 		return super.getHeadPortraitUrl();
 	}
 	}
 }
 }

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

@@ -81,23 +81,23 @@
 						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
 						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
 					</span>
 					</span>
 					<p>
 					<p>
-						<a th:href="@{/portal/service/serviceIndex}">高企服务</a>
-						<a href="#">科技项目</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceHigh}">高企服务</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceProject}">科技项目</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">知识产权</a>
-						<a href="#">合作客户</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceProperty}">知识产权</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceCustomer}">合作客户</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">企业认证</a>
-						<a href="#">服务能力</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceAuthentication}">企业认证</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceAbility}">服务能力</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">管理体系</a>
-						<a href="#">服务流程</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceAdministration}">管理体系</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceProcess}">服务流程</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">品牌通</a>
+						<a th:href="@{/portal/service/serviceIndex#serviceBrand}">品牌通</a>
 					</p>
 					</p>
 				</li>
 				</li>
 				<li>
 				<li>
@@ -105,24 +105,17 @@
 					<span>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">
 						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">
 					</span>
 					</span>
-					<p>
-						<a href="#">热门关注</a>
-						<a href="#">最新需求</a>
+						<p>
+						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexAchievement}">转换技术成果</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">最新发布</a>
-						<a href="#">热门需求</a>
+						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexDiff}">解决技术难题</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">专利技术</a>
-						<a href="#">企业技术需求</a>
+						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">实用技术</a>
-						<a href="#">技术人才需求</a>
-					</p>
-					<p>
-						<a href="#">知识产权交易政策</a>
+						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
 					</p>
 					</p>
 				</li>
 				</li>
 				<li>
 				<li>
@@ -163,17 +156,17 @@
 					<span>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 					</span>
 					</span>
-					<p>
-						<a href="#">公司简介</a>
+				<p>
+						<a th:href="@{/portal/aboutUs}">公司简介</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">业务范围</a>
+						<a th:href="@{/portal/aboutUs#business}">业务范围</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">荣誉资质</a>
+						<a th:href="@{/portal/aboutUs#honor}">荣誉资质</a>
 					</p>
 					</p>
 					<p>
 					<p>
-						<a href="#">发展历程</a>
+						<a th:href="@{/portal/aboutUs#development}">发展历程</a>
 					</p>
 					</p>
 				</li>
 				</li>
 			</ol>
 			</ol>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html


+ 1 - 3
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -10,9 +10,7 @@
 <body>
 <body>
 
 
 		<div th:replace="common::nav('','thindTankIndex')"></div>
 		<div th:replace="common::nav('','thindTankIndex')"></div>
-		 <div class="carousel">
-        <img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt="First slide">
-    </div>
+		
 	
 	
 	<!--主体内容区域开始-->
 	<!--主体内容区域开始-->
 	<div id="zizone">
 	<div id="zizone">

+ 0 - 2
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -21,8 +21,6 @@
 	    	<div class="container">    		           
 	    	<div class="container">    		           
 	            <ul class="detail_toptitle">
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
-	            	<li>></li> 
-	                 <li><a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a></li>
 	                <li>></li>               
 	                <li>></li>               
 	                <li class="that"><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	                <li class="that"><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	            </ul>
 	            </ul>