yee 8 years ago
parent
commit
200774f30f
38 changed files with 266 additions and 670 deletions
  1. 22 11
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 42 21
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  3. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java
  4. 2 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java
  5. 3 1
      src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java
  6. 6 2
      src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml
  7. 3 3
      src/main/java/com/goafanti/user/controller/UserApiController.java
  8. 78 0
      src/main/webapp/WEB-INF/views/common.html
  9. 0 311
      src/main/webapp/WEB-INF/views/index.html
  10. 3 19
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  11. 3 16
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  12. 1 2
      src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html
  13. 36 29
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html
  14. 1 2
      src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/evaluation/index.html
  16. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  17. 21 41
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  18. 1 2
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html
  19. 1 2
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html
  20. 1 2
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html
  21. 1 2
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html
  22. 1 2
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html
  23. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  24. 4 29
      src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html
  25. 1 2
      src/main/webapp/WEB-INF/views/portal/ipr/apply.html
  26. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/iso.html
  27. 1 1
      src/main/webapp/WEB-INF/views/portal/ipr/patentOperation.html
  28. 2 11
      src/main/webapp/WEB-INF/views/portal/ipr/service.html
  29. 1 1
      src/main/webapp/WEB-INF/views/portal/news.html
  30. 3 59
      src/main/webapp/WEB-INF/views/portal/news/newsDetails.html
  31. 16 84
      src/main/webapp/WEB-INF/views/portal/news/newsIndex.html
  32. 1 1
      src/main/webapp/WEB-INF/views/portal/patent.html
  33. 1 2
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html
  34. 1 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html
  35. 1 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html
  36. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  37. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  38. 1 1
      src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html

+ 22 - 11
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1020,7 +1020,6 @@ public class AdminApiController extends CertifyApiController {
 
 		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
 				orgIntellectualProperty.getUid(), orgIntellectualProperty.getIntellectualPropertyNumber());
-		
 
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
@@ -1043,7 +1042,7 @@ public class AdminApiController extends CertifyApiController {
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
-			if (null != p && !p.getId().equals(oip.getId())){
+			if (null != p && !p.getId().equals(oip.getId())) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -1529,21 +1528,16 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
 		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
-
+		OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 		if (StringUtils.isBlank(oac.getId())) {
 			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
 				return res;
 			}
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
+
 			if (null != ac) {
-				Calendar c = Calendar.getInstance();
-				c.setTime(ac.getStartDate());
-				Integer s = c.get(Calendar.YEAR);
-				c.setTime(ac.getEndDate());
-				Integer e = c.get(Calendar.YEAR);
-				if (oac.getYear() < s || oac.getYear() > e) {
-					res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+				res = disposeActivityYear(res, ac, oac);
+				if (!res.getError().isEmpty()) {
 					return res;
 				}
 
@@ -1561,6 +1555,10 @@ public class AdminApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
 				return res;
 			}
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -3091,4 +3089,17 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return ocp;
 	}
+
+	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(ac.getStartDate());
+		Integer s = c.get(Calendar.YEAR);
+		c.setTime(ac.getEndDate());
+		Integer e = c.get(Calendar.YEAR);
+		if (oac.getYear() < s || oac.getYear() > e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+			return res;
+		}
+		return res;
+	}
 }

+ 42 - 21
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1412,7 +1412,13 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkUserLogin(res)) {
+		if (StringUtils.isBlank(orgActivityCost.getAid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "项目ID"));
+			return res;
+		}
+
+		if (null == orgActivityCost.getYear()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "费用年份"));
 			return res;
 		}
 
@@ -1427,15 +1433,20 @@ public class CognizanceApiController extends CertifyApiController {
 
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
-		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
-				TokenManager.getUserId());
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAidAndYear(oac.getAid(),
+				TokenManager.getUserId(), orgActivityCost.getYear());
+		OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 		if (StringUtils.isBlank(oac.getId())) {
 			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
-
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
+			
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
+			
 			oac.setStartDate(ac.getStartDate());
 			oac.setEndDate(ac.getEndDate());
 			oac.setId(UUID.randomUUID().toString());
@@ -1443,10 +1454,14 @@ public class CognizanceApiController extends CertifyApiController {
 			oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityCostService.insert(oac);
 		} else {
-			if (null != ccc && !ccc.getId().equals(oac.getId())){
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
+			res = disposeActivityYear(res, ac, oac);
+			if (!res.getError().isEmpty()) {
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
@@ -1610,14 +1625,15 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-		
-		if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())){
+
+		if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "知识产权编号", "知识产权编号"));
 			return res;
 		}
-		
-		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
-		
+
+		OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
+				TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
+
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
@@ -1629,7 +1645,7 @@ public class CognizanceApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgIntellectualProperty, oip);
 
 		if (StringUtils.isBlank(oip.getId())) {
-			if (null != p){
+			if (null != p) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -1640,7 +1656,7 @@ public class CognizanceApiController extends CertifyApiController {
 			oip.setType(IntellectualPropertyType.COMMON.getCode());
 			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
-			if (null != p && !p.getId().equals(oip.getId())){
+			if (null != p && !p.getId().equals(oip.getId())) {
 				res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
 				return res;
 			}
@@ -2575,14 +2591,6 @@ public class CognizanceApiController extends CertifyApiController {
 		return fileName;
 	}
 
-	// 判断用户是否通过认证
-	/*
-	 * private Result checkCertify(Result res) { OrganizationIdentity o =
-	 * organizationIdentityService.selectOrgIdentityByUserId(TokenManager.
-	 * getUserId()); if (null == o || 5 != o.getAuditStatus()) {
-	 * res.getError().add(buildError(ErrorConstants.NON_CERTIFIED,
-	 * "未通过实名认证,无法操作!")); } return res; }
-	 */
 
 	// 高企认定
 	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
@@ -2593,5 +2601,18 @@ public class CognizanceApiController extends CertifyApiController {
 	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
 		return orgAnnualReportService.selectAnnualReportBo(uid, year);
 	}
+	
+	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(ac.getStartDate());
+		Integer s = c.get(Calendar.YEAR);
+		c.setTime(ac.getEndDate());
+		Integer e = c.get(Calendar.YEAR);
+		if (oac.getYear() < s || oac.getYear() > e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+			return res;
+		}
+		return res;
+	}
 
 }

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java

@@ -21,7 +21,7 @@ public interface OrgActivityCostService {
 
 	int deleteByAid(List<String> id);
 
-	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String userId);
+	OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(String aid, String userId, Integer year);
 
 	OrgActivityCost selectByPrimaryKey(String id);
 

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -97,8 +97,8 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 
 
 	@Override
-	public OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid) {
-		return orgActivityCostMapper.selectOrgActivityCostByUidAndAid(aid, uid);
+	public OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(String aid, String uid, Integer year) {
+		return orgActivityCostMapper.selectOrgActivityCostByUidAndAidAndYear(aid, uid, year);
 	}
 
 

+ 3 - 1
src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.cognizance.bo.OrgActivityDetailCostBo;
 import com.goafanti.common.model.OrgActivityCost;
 
@@ -24,7 +26,7 @@ public interface OrgActivityCostMapper {
 
 	int batchDeleteByAid(List<String> aid);
 
-	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid);
+	OrgActivityCost selectOrgActivityCostByUidAndAidAndYear(@Param("aid")String aid, @Param("uid")String uid, @Param("year")Integer year);
 
 	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
 

+ 6 - 2
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -358,11 +358,15 @@
 	</foreach>
   </update>
   
-  <select id="selectOrgActivityCostByUidAndAid" resultMap="BaseResultMap" >
+  <select id="selectOrgActivityCostByUidAndAidAndYear" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />
     from org_activity_cost
-    where aid = #{0} and uid = #{1} and deleted_sign = 0
+    where 
+    	aid = #{aid,jdbcType=VARCHAR} 
+    and uid = #{uid,jdbcType=VARCHAR} 
+    and year = #{year,jdbcType=INTEGER} 
+    and deleted_sign = 0
   </select>
   
    <select id="selectOrgActivityCostByAidAndYear" resultMap="BaseResultMap" >

+ 3 - 3
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -383,8 +383,8 @@ public class UserApiController extends BaseApiController {
 		BeanUtils.copyProperties(userEdu, ue);
 
 		if (StringUtils.isBlank(ue.getId())) {
-			userEdu.setId(UUID.randomUUID().toString());
-			userEdu.setUid(TokenManager.getUserId());
+			ue.setId(UUID.randomUUID().toString());
+			ue.setUid(TokenManager.getUserId());
 			userEduService.insert(ue);
 		} else {
 			userEduService.updateByPrimaryKeySelective(ue);
@@ -671,7 +671,7 @@ public class UserApiController extends BaseApiController {
 
 		if (StringUtils.isBlank(orgHumanResource.getId())) {
 			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
-					orgHumanResource.getUid())) {
+					TokenManager.getUserId())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度人力资源情况已录入!"));
 				return res;
 			}

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

@@ -38,6 +38,84 @@
       </div>
   </th:block>
   
+  <th:block th:fragment="sublogo">
+  	<a th:href="${basePath + '/portal/index.html'}"><img th:src="${portalHost + '/img/logo.png'}" /></a>
+  </th:block>
+  
+  <th:block th:fragment="subMenu">
+  	<ul class="nav_content">
+		<li class="home"><a href="#">首页</a></li>
+		<li><a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
+				<li><a
+					th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>
+				<!-- <li><a href="#">Idea</a></li> -->
+				<li><a
+					th:href="${basePath + '/portal/search/subscriber.html'}">伙伴</a></li>
+				<li><a
+					th:href="${basePath + '/portal/search/subscriber.html'}">行家</a></li>
+				<li><a
+					th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
+			<ul class="secondary_navigation_nav">
+				<li><a
+					th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
+				<li><a
+					th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
+				<!-- <li><a href="#">众筹专区</a></li> -->
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/activity/activityIndex.html'}">活动圈</a>
+			<ul class="secondary_navigation_nav">
+				<li><a
+					th:href="${basePath + '/portal/activity/details.html'}">活动详情</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html'}">建设兵团</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html'}">平台定制</a></li>
+				<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html'}">平台运营</a></li>
+				<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html'}">活动筹划</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际技术</a></li>
+				<li><a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际伙伴</a></li>
+				<li><a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际专家</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/highTech/authentication.html'}">高企培育</a></li>
+				<!-- <li><a th:href="${basePath + '/portal/highTech/authentication.html'}">科技项目</a></li> -->
+				<li><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
+				<li><a th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
+			</ul></li>
+		<li><a th:href="${basePath + '/portal/news/newsIndex.html'}">策源地</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/news/newsIndex.html'}">新闻快讯</a></li>
+				<li><a th:href="${basePath + '/portal/news/newsIndex.html'}">科技政策</a></li>
+				<li><a th:href="${basePath + '/portal/news/newsIndex.html'}">政策解读</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">创意圈</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">项目圈</a></li>
+				<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">创客圈</a></li>
+				<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">结义园</a></li>
+			</ul></li>
+		<li><a
+			th:href="${basePath + '/portal/financial/financialIndex.html'}">金融圈</a>
+			<ul class="secondary_navigation_nav">
+				<li><a th:href="${basePath + '/portal/financial/financialIndex.html'}">金融街</a></li>
+			</ul></li>
+	</ul>
+  </th:block>
+  
   <th:block th:fragment="copyright">
 	<div onclick="window.open('http://b.qq.com/webc.htm?new=0&sid=259388822&o=阿凡提咨询&q=7', '_blank', 'height=502, width=644,toolbar=no,scrollbars=no,menubar=no,status=no');"
 	  style="line-height:1;position: fixed; right: 15px; bottom: 180px; background-color: #58a3ff; width: 60px; height: 60px; text-align: center; border-radius: 3px;">

+ 0 - 311
src/main/webapp/WEB-INF/views/index.html

@@ -1,311 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org"
-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>首页</title>
-	<link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-	<link th:href="${staticDomain + '/portal/css/style.css'}" rel="stylesheet" />
-	<link th:href="${staticDomain + '/portal/css/index.css'}" rel="stylesheet" />
-</head>
-<body>
-	<header>
-		<div th:replace="common::{topNav}"></div>
-	</header>
-	<div class="container header_nav">
-		<div class="row clearfix">
-			<div class="col-md-12 logo">
-				<img th:src="${staticDomain + '/portal/img/logo.png'}" />
-			</div>
-
-		</div>
-		<div class="search">
-			<div class="row clearfix">
-				<div class="col-lg-8 col-md-offset-2">
-					<div class="input-group ">
-						<input type="text" class="form-control"> <span
-							class="input-group-btn">
-							<button class="btn btn-default" type="button">搜索</button>
-						</span>
-					</div>
-					<!-- /input-group -->
-				</div>
-				<div class="col-lg-8 col-md-offset-2">
-					<div class="hot">
-						<ul>
-							<li><a href="#">科技交易</a></li>
-							<li><a href="#">网上创客</a></li>
-							<li><a href="#">趣科普</a></li>
-							<li><a href="#">科技金融</a></li>
-						</ul>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="container content">
-		<div class="row clearfix">
-			<div class="content_lt">
-				<div class="content_nav">
-					<ul id="myTab">
-						<li><a href="#tab1" data-toggle="tab">关注</a></li>
-						<li class="active"><a href="#tab2" data-toggle="tab">政策</a></li>
-						<li><a href="#tab3" data-toggle="tab">前沿</a></li>
-						<li><a href="#tab4" data-toggle="tab">明星</a></li>
-						<li><a href="#tab5" data-toggle="tab">活动</a></li>
-						<li><a href="#tab6" data-toggle="tab">VR</a></li>
-					</ul>
-
-				</div>
-
-				<div id="myTabContent" class="content_list tab-content">
-					<div id="tab1" class="tab-pane"></div>
-					<div id="tab2" class="tab-pane in active">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>科技成果转化频发政策“红包”,甜头怎么尝</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>11:16</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>成果转化是从一种创新走向另一种创新</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>12:11</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>从“科技的春天”到“创新的春天”</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>13:26</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>专利战略在企业创新全过程中的应用</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>15:23</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab3" class="tab-pane">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>NASA新一代太空望远镜 届时将看到宇宙第一光芒</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>07:56</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>满满的黑科技 推不倒的自行车</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>08:06</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>最新3D全息投影技术 为可口可乐麦当劳服务</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>09:33</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>德国科学家发明新型化合物 属无机纳米晶体结构</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>12:36</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>中国首条空中自行车道试营 体验云端行走</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>17:25</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab4" class="tab-pane">
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_1.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>美国工程院院士,资深核能咨询顾问,美国能源部高级 顾问,美国国家研究委员会董事会能源与环境系统主席。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">钱平 | Douglas M. Chapin</i> <i>美国</i>
-									<i>能源与环境</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_2.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>加拿大工程院院士,加拿大皇家学院院士,荣获英国国际名人传记中心颁发的的“信号处理研究及教育杰出贡献奖”。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">黄干| Kon Max Wong</i> <i>加拿大</i>
-									<i>信号处理</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_3.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>英国皇家工程院院士,英国纽卡斯尔大学水利工程系教授,1995年获得欧洲地球物理学会金徽章奖。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">康英达|Enda O'Connell</i> <i>英
-										国</i> <i>水利工程</i>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="info_img">
-								<img th:src="${staticDomain + '/portal/img/mx_img_4.png'}" />
-							</div>
-							<div class="info_txt">
-								<p>(杂交水稻之父、首届国家最高科学奖获得者
-									袁隆平是杂交水稻研究领域的开创者和带头人,致力于杂交水稻的研究,先后成功研发出“三系法”杂交
-									水稻、“两系法”杂交水稻、超级杂交稻一期、二期,与此同时,袁隆平提出并实施“种三产四丰产工程”,运用超级杂交稻的技术成果,[3]
-									出版中、英文专著6部,发表论文60余篇。</p>
-								<div class="source">
-									<span>中国网</span> <i class="name">袁隆平</i> <i>中国</i> <i>农业</i>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab5" class="tab-pane">
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>港洽周科技交流对接会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>09:16</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>中以美高端医疗产业高峰论坛会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>11:15</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>2017年科技展览会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>13:13</span>
-								</div>
-							</div>
-						</div>
-						<div class="content_info ">
-							<div class="zc_info_txt">
-								<p>2017中国科技展-北京科博会</p>
-								<div class="source">
-									<span>凤凰财经</span> <span>04-01</span> <span>16:23</span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div id="tab6" class="tab-pane"></div>
-				</div>
-			</div>
-			<div class="content_rt">
-				<div>
-					<h4>科技交易</h4>
-					<ul>
-						<li><a href="#">成果</a></li>
-						<li><a href="#">专家</a></li>
-						<li><a href="#">技术集群</a></li>
-						<li><a href="#">经纪人</a></li>
-						<li><a href="#">创业项目</a></li>
-						<li><a href="#">职业科技人</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技咨询</h4>
-					<ul>
-						<li><a href="./highTech.html">高企认定</a></li>
-						<li><a href="#">专利申请</a></li>
-						<li><a href="#">知识产权贯标</a></li>
-						<li><a href="#">ISO9001</a></li>
-						<li><a href="#">创新体系</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技思想</h4>
-					<ul>
-						<li><a href="#">科技明星</a></li>
-						<li><a href="#">前沿科技思想</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>科技金融</h4>
-					<ul>
-						<li><a href="#">投资机构</a></li>
-						<li><a href="#">金融项目</a></li>
-						<li><a href="#">网上创客</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>应用工具</h4>
-					<ul>
-						<li><a href="#">技术评估</a></li>
-						<li><a href="#">技术查新</a></li>
-						<li><a href="#">空间主页</a></li>
-						<li><a href="#">会员体系</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>社群百科</h4>
-					<ul>
-						<li><a href="#">科技活动</a></li>
-						<li><a href="#">技术社群</a></li>
-						<li><a href="#">科技百科</a></li>
-						<li><a href="#">趣科普</a></li>
-					</ul>
-				</div>
-				<div>
-					<h4>合作伙伴</h4>
-					<ul>
-						<li><a href="#">政府合作</a></li>
-						<li><a href="#">高校合作</a></li>
-						<li><a href="#">科研单位</a></li>
-						<li><a href="#">民间达人</a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div
-		onclick="javascript:window.open('http://b.qq.com/webc.htm?new=0&sid=259388822&o=阿凡提咨询&q=7', '_blank', 'height=502, width=644,toolbar=no,scrollbars=no,menubar=no,status=no');"
-		style="position: fixed; right: 20px; bottom: 20px; background-color: #58a3ff; width: 60px; height: 60px; text-align: center; border-radius: 3px;">
-		<img
-			style="cursor: pointer; position: absolute; top: 5px; left: 14px;"
-			border="0"
-			src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAANlBMVEUAAAD////////////////////////////////////////////////////////////////////xY8b8AAAAEXRSTlMAgMAwEPDgQKCQYNBQn7BwIKfc/GEAAAC0SURBVDjLndNbEoMgDAXQBEIE1Na7/81Wqh18xHz0/DGEXDIDdDLxK4SZBzLJnLBTFrqJCQca7f0uXSpEcaHnlIIbpoMFd8lt0BynHQE/A5bXYUZYtBcwTJV+FKbQE/4sKLSpCQ9iP+9kiOLZsI3ot0jwCEW4JnrDxe0KGQ9SK5gwyghbbGMIy1pkylQDbbIZINRl/8XJrFYHds83hXYBNjW+Xa48Gv9TaglNWb6rgVfv7ZIf0/Atyg0k6YwAAAAASUVORK5CYII="
-			alt="客服咨询"> <span
-			style="color: #fff; position: absolute; bottom: 5px; left: 0; width: 100%; font-size: 12px;">咨询客服</span>
-	</div>
-	<div th:replace="common::footer(~{::script})">
-		<script src="//cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
-		<script src="//cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-	</div>
-</body>
-</html>

+ 3 - 19
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html

@@ -24,26 +24,10 @@
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
-			<div class="col-md-8">
-				<ul class="nav_content">
-					<li><a href="#">技术交易</a></li>
-					<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>
-					<li><a href="#">Idea</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/subscriber.html'}">伙伴</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/subscriber.html'}">行家</a></li>
-					<li><a
-						th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a></li>
-				</ul>
-			</div>
-			<div class="col-md-1 search">
-				<span> <img th:src="${portalHost + '/img/search_ioc.png'}" />
-				</span>
+			<div class="col-md-9">
+				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
 	</div>

+ 3 - 16
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -25,23 +25,10 @@
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost+ '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
-			<div class="col-md-8">
-				<ul class="nav_content">
-					<li><a href="#">技术交易</a></li>
-					<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
-					<li><a th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>
-					<li><a href="#">Idea</a></li>
-					<li><a th:href="${basePath + '/portal/search/subscriber.html'}">伙伴</a></li>
-					<li><a th:href="${basePath + '/portal/search/subscriber.html'}">行家</a></li>
-					<li><a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a></li>
-				</ul>
-			</div>
-			<div class="col-md-1 search">
-				<span> <img
-					th:src="${portalHost + '/img/search_ioc.png'}" />
-				</span>
+			<div class="col-md-9">
+				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
 	</div>

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


+ 36 - 29
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -15,20 +15,18 @@
 		<div th:replace="common::{topNav}">
 			<div class="container">
 				<div class="lt">欢迎进入科技认知计算交易平台!</div>
-	               <div class="rt">
-					<a href="/user/login.html" class="login">登录</a>
-	                   <a href="/user/signIn.html">注册</a>
-					<a href="#">导航</a>
-					<a href="#">关于我们</a>
+				<div class="rt">
+					<a href="/user/login.html" class="login">登录</a> <a
+						href="/user/signIn.html">注册</a> <a href="#">导航</a> <a href="#">关于我们</a>
 					<a href="#">联系我们</a>
 				</div>
-			</div>		
+			</div>
 		</div>
 	</header>
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img src="../../../img/logo.png" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-5">
 				<ul class="nav_content">
@@ -39,10 +37,11 @@
 			<div class="col-md-4 search">
 				<div class="row clearfix">
 					<div class="input-group ">
-						<input id="searchInput" type="text" class="form-control" placeholder="平台资源关键词搜索">
-						<span id="searchImg" class="input-group-btn">
-			           		<a class="button"><img src="../../../img/search_sm_ioc.png" /></a>
-			           	</span>
+						<input id="searchInput" type="text" class="form-control"
+							placeholder="平台资源关键词搜索"> <span id="searchImg"
+							class="input-group-btn"> <a class="button"><img
+								src="../../../img/search_sm_ioc.png" /></a>
+						</span>
 					</div>
 					<!-- /input-group -->
 				</div>
@@ -54,9 +53,8 @@
 		<div class="detail_title" th:text="${demand.name}">铸造用高发热保温冒口套</div>
 		<div class="row">
 			<div class="col-md-6 detial_sub">
-				 <span
-					class="detial_sub_text" th:text="${demand.employerName}">
-					 </span>
+				<span class="detial_sub_text" th:text="${demand.employerName}">
+				</span>
 			</div>
 		</div>
 		<div class="row">
@@ -80,8 +78,7 @@
 				<span class="detial_sub_icon"> <img
 					th:src="${portalHost +'/img/demand_ico_3.png'}" alt="预算" />
 				</span> <span class="detial_sub_title"> 预算: </span> <span
-					class="money_text" th:text="${demand.budgetCostS}"> 面议
-				</span>
+					class="money_text" th:text="${demand.budgetCostS}"> 面议 </span>
 			</div>
 			<div class="col-md-6 detial_sub">
 				<span class="detial_sub_icon"> <img
@@ -106,11 +103,14 @@
 			<div class="detail_button clearfix" th:if="${isLogin}">
 				<button type="button" id="interest"
 					th:class="${demand.interestId != null} ?  'btn like' : 'btn dislike'">我感兴趣</button>
-				<button type="button" data-toggle="modal" data-target="#order" class="btn orderBtn">我要接单</button>
+				<button type="button" data-toggle="modal" data-target="#order"
+					class="btn orderBtn">我要接单</button>
 			</div>
 			<div class="detail_button clearfix" th:if="${!isLogin}">
-				<button type="button" class="btn dislike" onclick="window.open('/user/signIn.html')">我感兴趣</button>
-				<button type="button" class="btn" onclick="window.open('/user/signIn.html')">我要接单</button>
+				<button type="button" class="btn dislike"
+					onclick="window.open('/user/signIn.html')">我感兴趣</button>
+				<button type="button" class="btn"
+					onclick="window.open('/user/signIn.html')">我要接单</button>
 			</div>
 		</div>
 	</div>
@@ -153,26 +153,31 @@
 			</li>
 		</ul>
 	</div>
-	
+
 	<input type="hidden" id="demandId" th:value=${demand.id}>
 	<input type="hidden" id="interestId" th:value=${demand.interestId}>
-	
-	<div class="modal fade" tabindex="-1" role="dialog" id="order" aria-labelledby="myModalLabel">
+
+	<div class="modal fade" tabindex="-1" role="dialog" id="order"
+		aria-labelledby="myModalLabel">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
 					<h4 class="modal-title">我要接单</h4>
 				</div>
 				<div class="modal-body">
 					<div class="row">
-						<span class="col-md-2" style="text-align: right">附件:</span>
-						<input class="col-md-8" type="file" id="uploadFile">
+						<span class="col-md-2" style="text-align: right">附件:</span> <input
+							class="col-md-8" type="file" id="uploadFile">
 					</div>
 					<div class="row" style="margin-top: 20px">
 						<div class="col-md-2" style="text-align: right">备注:</div>
 						<div class="col-md-10">
-							<textarea style="max-width:460px" id="comment" class="form-control" rows="3"></textarea>
+							<textarea style="max-width: 460px" id="comment"
+								class="form-control" rows="3"></textarea>
 						</div>
 					</div>
 				</div>
@@ -186,9 +191,11 @@
 	<footer>
 		<div th:replace="common::copyright"></div>
 	</footer>
-	<div th:replace="common::footer(~{::script})"><script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-	<script type="text/javascript"
-		th:src="${portalHost + '/highTech/detail/demandDetail.js'}"></script></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript"
+			th:src="${portalHost + '/highTech/detail/demandDetail.js'}"></script>
+	</div>
 </body>
 
 </html>

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


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


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


+ 21 - 41
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html

@@ -13,34 +13,21 @@
 		<div th:replace="common::{topNav}">
 			<div class="container">
 				<div class="lt">欢迎进入科技认知计算交易平台!</div>
-	               <div class="rt">
-					<a href="/user/login.html" class="login">登录</a>
-	                   <a href="/user/signIn.html">注册</a>
-					<a href="#">导航</a>
-					<a href="#">关于我们</a>
+				<div class="rt">
+					<a href="/user/login.html" class="login">登录</a> <a
+						href="/user/signIn.html">注册</a> <a href="#">导航</a> <a href="#">关于我们</a>
 					<a href="#">联系我们</a>
 				</div>
-			</div>		
+			</div>
 		</div>
 	</header>
 	<div class="container header_nav">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
-			</div>
-			<div class="col-md-8">
-				<ul class="nav_content">
-					<li class="active"><a
-						th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
-					<li><a href="#">政策解读</a></li>
-					<li><a th:href="${basePath + '/portal/highTech/evaluate/evaluate.html'}">企业自评</a></li>
-					<li><a th:href="${basePath + '/user/account/services.html#contract'}">高企申请</a></li>
-				</ul>
+				<div th:replace="common::sublogo"></div>
 			</div>
-			<div class="col-md-1 search">
-				<span> <img
-					th:src="${portalHost + '/img/search_ioc.png'}" />
-				</span>
+			<div class="col-md-9">
+				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
 	</div>
@@ -54,18 +41,15 @@
 		<!-- 轮播(Carousel)项目 -->
 		<div class="carousel-inner">
 			<div class="item active">
-				<img
-					th:src="${portalHost + '/img/highTech_slide_1.jpg'}"
+				<img th:src="${portalHost + '/img/highTech_slide_1.jpg'}"
 					alt="First slide">
 			</div>
 			<div class="item">
-				<img
-					th:src="${portalHost + '/img/highTech_slide_2.jpg'}"
+				<img th:src="${portalHost + '/img/highTech_slide_2.jpg'}"
 					alt="Second slide">
 			</div>
 			<div class="item">
-				<img
-					th:src="${portalHost + '/img/highTech_slide_3.jpg'}"
+				<img th:src="${portalHost + '/img/highTech_slide_3.jpg'}"
 					alt="Third slide">
 			</div>
 		</div>
@@ -86,8 +70,7 @@
 		<div class="discount">
 			<div class="discount_content">
 				<div class="discount_img">
-					<img
-						th:src="${portalHost + '/img/discount_ioc_1.png'}">
+					<img th:src="${portalHost + '/img/discount_ioc_1.png'}">
 				</div>
 				<div class="discount_info">
 					<span class="blue">1.企业税收减免</span>
@@ -96,8 +79,7 @@
 			</div>
 			<div class="discount_content">
 				<div class="discount_img">
-					<img
-						th:src="${portalHost + '/img/discount_ioc_2.png'}">
+					<img th:src="${portalHost + '/img/discount_ioc_2.png'}">
 				</div>
 				<div class="discount_info">
 					<span class="green">2.财政直接补贴</span>
@@ -106,8 +88,7 @@
 			</div>
 			<div class="discount_content">
 				<div class="discount_img">
-					<img
-						th:src="${portalHost + '/img/discount_ioc_3.png'}">
+					<img th:src="${portalHost + '/img/discount_ioc_3.png'}">
 				</div>
 				<div class="discount_info">
 					<span class="red">3.企业上市优先</span>
@@ -116,8 +97,7 @@
 			</div>
 			<div class="discount_content">
 				<div class="discount_img">
-					<img
-						th:src="${portalHost + '/img/discount_ioc_4.png'}">
+					<img th:src="${portalHost + '/img/discount_ioc_4.png'}">
 				</div>
 				<div class="discount_info">
 					<span class="yellow">4.政策资金倾斜</span>
@@ -126,8 +106,7 @@
 			</div>
 			<div class="discount_content clear_mg">
 				<div class="discount_img">
-					<img
-						th:src="${portalHost + '/img/discount_ioc_5.png'}">
+					<img th:src="${portalHost + '/img/discount_ioc_5.png'}">
 				</div>
 				<div class="discount_info">
 					<span class="purple">5.企业品牌提升</span>
@@ -232,12 +211,13 @@
 		</div>
 
 	</div>
-<footer>
+	<footer>
 		<div th:replace="common::copyright"></div>
 	</footer>
-	<div th:replace="common::footer(~{::script})"><script type="text/javascript"
-		th:src="${portalHost + '/vendors.js'}"></script>
-	<script type="text/javascript"
-		th:src="${portalHost + '/highTech/authentication.js'}"></script></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript"
+			th:src="${portalHost + '/highTech/authentication.js'}"></script>
+	</div>
 </body>
 </html>

File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html


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


File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html


File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html


File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html


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


+ 4 - 29
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html

@@ -11,41 +11,16 @@
 <body>
 	<header>
 		<div th:replace="common::{topNav}">
-			<div class="container">
-				<div class="lt">欢迎进入科技认知计算交易平台!</div>
-	               <div class="rt">
-					<a href="/user/login.html" class="login">登录</a>
-	                   <a href="/user/signIn.html">注册</a>
-					<a href="#">导航</a>
-					<a href="#">关于我们</a>
-					<a href="#">联系我们</a>
-				</div>
-			</div>		
+				
 		</div>
 	</header>
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
-			<div class="col-md-8">
-				<ul class="nav_content">
-					<li><a href="#">技术交易</a></li>
-					<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>
-					<li><a href="#">Idea</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/subscriber.html'}">伙伴</a></li>
-					<li><a
-						th:href="${basePath + '/portal/search/subscriber.html'}">行家</a></li>
-					<li class="active"><a
-						th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a></li>
-				</ul>
-			</div>
-			<div class="col-md-1 search">
-				<span> <img th:src="${portalHost + '/img/search_ioc.png'}" />
-				</span>
+			<div class="col-md-9">
+				<div th:replace="common::subMenu"></div>
 			</div>
 		</div>
 	</div>

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


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


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


+ 2 - 11
src/main/webapp/WEB-INF/views/portal/ipr/service.html

@@ -10,22 +10,13 @@
 <body>
 	<header>
 		<div th:replace="common::{topNav}">
-			<div class="container">
-				<div class="lt">欢迎进入科技认知计算交易平台!</div>
-	               <div class="rt">
-					<a href="/user/login.html" class="login">登录</a>
-	                   <a href="/user/signIn.html">注册</a>
-					<a href="#">导航</a>
-					<a href="#">关于我们</a>
-					<a href="#">联系我们</a>
-				</div>
-			</div>		
+				
 		</div>
 	</header>
 	<div class="container header_nav">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
-				<img th:src="${portalHost + '/img/logo.png'}" />
+				<div th:replace="common::sublogo"></div>
 			</div>
 			<div class="col-md-8">
 				<ul class="nav_content">

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


File diff suppressed because it is too large
+ 3 - 59
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html


File diff suppressed because it is too large
+ 16 - 84
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html


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


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


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


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


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


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


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