Sfoglia il codice sorgente

Merge branch 'test' of jishutao/jitao-server into prod

anderx 3 anni fa
parent
commit
ff270c2252

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

@@ -814,8 +814,8 @@ public class WebpageController extends BaseController {
 
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/index")
-	public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
-//		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+	public ModelAndView mainIndex( ModelAndView modelview) {
+
 		modelview.setViewName("/portal/index");
 		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getHomeIndex(1,1);
 		patentCategory = patentCategory.subList(0, Math.min(7, patentCategory.size()));
@@ -845,15 +845,9 @@ public class WebpageController extends BaseController {
 				.listNews(0, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
 		modelview.addObject("news", newsList);//资讯
 		//
-		List<News> subscriptions = (List<News>) newsService
-				.listNews(99, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
-		modelview.addObject("subscription", subscriptions);//技淘观点精选
-
-		if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
-				&& subscriptions.get(0).getSourceUrl().contains(".")) {
-			modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
-		}
-
+		List<News> encyclopedias = (List<News>) newsService
+				.listNews(98, null, null, null, null, null, null, 1, 2, "2", null, null,null).getList();
+		modelview.addObject("encyclopedias", encyclopedias);//百科
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
 		if(null != blist){
@@ -862,32 +856,7 @@ public class WebpageController extends BaseController {
 		//视频
 		String url = adminVideoService.getIndexVideo(1).getUrl();//首页
 		modelview.addObject("vurl", url);
-		// List<AchievementObject>
-		// achievementObjects=achievementService.getHotAchievements(9, url,
-		// "web_index");
-		// modelview.addObject("achievements",achievementObjects);
-		//
-		//
-		//
-		//
-		// List<DemandListBo> demandListBos=demandService.getHotDemand(9, url,
-		// "web_index");
-		// for(DemandListBo demandListBo:demandListBos) {
-		// if(demandListBo.getPictureUrl()==null ||
-		// !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
-		// else
-		// demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
-		// }
-		// //专家
-		// List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
-		// for(UserIdentityBo u:aExperts) {
-		// if(u.getHeadPortraitUrl()!=null &&
-		// u.getHeadPortraitUrl().length()<=0) {
-		// u.setHeadPortraitUrl(null);
-		// }
-		// }
-		// modelview.addObject("experts",aExperts);
-		// modelview.addObject("demands",demandListBos);
+
 
 		return modelview;
 	}
@@ -1641,7 +1610,6 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 新闻详情
-	 * @param request
 	 * @param modelview
 	 * @return
 	 */

+ 5 - 5
src/main/java/com/goafanti/news/controller/AdminNewsApiController.java

@@ -90,12 +90,12 @@ public class AdminNewsApiController extends BaseApiController {
 		return res;
 	}
 
-/*
- * 新增
- *
- * */
+	/*
+	 * 新增
+	 *
+	 * */
 	@RequestMapping(value="/apply",method=RequestMethod.POST)
-public Result apply(@Valid InputNews news,BindingResult bindingResult,String[] publishPages) {
+	public Result apply(@Valid InputNews news,BindingResult bindingResult,String[] publishPages) {
 		Result result=new Result();
 		if (bindingResult.hasErrors()) {
 			result.getError().add(

+ 3 - 2
src/main/resources/props/config_local.properties

@@ -39,14 +39,15 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.11
-portal.host=//ss.jishutao.com/portal/1.2.17
+#portal.host=//ss.jishutao.com/portal/1.2.17
+portal.host=//statics.jishutao.com/portal/1.2.18
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 #本地
 #static.host=//172.16.1.187/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
-#portal.host=//172.16.0.255:3000/jitao/portal/1.2.12
+#portal.host=//172.16.0.255:3000/jitao/portal/1.2.18
 #portal.host=//172.16.1.187/portal/1.2.11
 
 #avatar.host=//ss.jishutao.com

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

@@ -23,37 +23,9 @@
 
 	  <div class="header">
 		<div class="container">
-			<div class="photoHeader"><img th:src="${portalHost+'/img/newMenu/index_header400.jpg'}" alt="">400-8800-962</div>
-			<div class="navigationList webkitHover">
-				<a>网站导航
-					<span class="webkitDown"></span>
-				</a>
-			</div>
-			<div>
-				<ul>
-					<li>
-						<a th:href="@{/user/signIn}">注册</a>
-					</li>
-					<li>
-						<a  th:if="!${isLogin}" href="javascript:;" class="head_login">登录</a>
-					</li>
-					<li th:if="${isLogin}" class="signin">
-						<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
-							th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a>
-						<a th:href="${basePath + '/user/logout'}">退出</a>
-					</li>
-
-					<li class="shopIcon">
-						<a th:href="@{/portal/technologyTrading/shopList}">
-							<img th:src="${portalHost+'/img/index/index_shopCar.jpg'}" alt="">购物车(<span class="numberTotal">0</span>)件 </a>
-                        <span class="glyphicon glyphicon-tint tint" aria-hidden="true"></span>
-					</li>
-				</ul>
-			</div>
-			<div class="technology"><a class="technology_login" href="javascript:;" >技术创业</a><a class="technology_estimate" th:href="@{/portal/evaluation/evaluate}">技术评估</a></div>
 			<div class="APP">
 				<img th:src="${portalHost+'/img/indedImg/inded30.png'}" alt="" />
-				<a>APP下载<span class="webkitDown"></span>
+				<a>&nbsp;APP下载<span class="webkitDown"></span>
 				</a>
 
 				<div class="xialaewm">
@@ -67,6 +39,37 @@
 					</div>
 				</div>
 			</div>
+
+			<div>
+				<ul>
+					<li class="technology">
+						<a class="technology_login" href="javascript:;" >技术创业</a><a class="technology_estimate" th:href="@{/portal/evaluation/evaluate}">技术评估</a>
+					</li>
+					<li class="shopIcon">
+						<a th:href="@{/portal/technologyTrading/shopList}">
+							<img th:src="${portalHost+'/img/index/index_shopCar.jpg'}" alt="">购物车(<span class="numberTotal">0</span>)件 </a>
+						<span class="glyphicon glyphicon-tint tint" aria-hidden="true"></span>
+					</li>
+					<li class="navigationList webkitHover">
+						<a>网站导航
+							<span class="webkitDown"></span>
+						</a>
+					</li>
+
+					<li>
+						<a class="reg"  style="color: #fff;" th:if="!${isLogin}" th:href="@{/user/signIn}">注册</a>
+					</li>
+					<li>
+						<a class="head_login log"  style="color: #1566ED;" th:if="!${isLogin}" href="javascript:;" >登录</a>
+					</li>
+					<li th:if="${isLogin}" class="signin">
+						<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
+							th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a>
+						<a th:href="${basePath + '/user/logout'}">[退出]</a>
+					</li>
+				</ul>
+			</div>
+			<div class="tel"><img th:src="${portalHost+'/img/index/index_tel.png'}" alt="">&nbsp;400-8800-962</div>
 		</div>
 		<div class="navWrapper webkitHover">
 			<ol>
@@ -76,19 +79,19 @@
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 					</span>
 					<p>
-						<a th:href="@{/portal/service/patent#recentPublish}">最新发布</a>
+						<a th:href="@{/portal/service/patent#zxfb}">最新发布</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/patent#patentService}">专利服务</a>
+						<a th:href="@{/portal/service/patent#zlfw}">专利服务</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/patent#branchService}">商标服务</a>
+						<a th:href="@{/portal/service/patent#sbfw}">商标服务</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/patent#copyrightService}">版权服务</a>
+						<a th:href="@{/portal/service/patent#bqfw}">版权服务</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
+						<a th:href="@{/portal/service/patent#zcbk}">知产百科</a>
 					</p>
 
 				</li>
@@ -175,16 +178,16 @@
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 					</span>
 				<p>
-						<a th:href="@{/portal/aboutUs}">公司简介</a>
+						<a th:href="@{/portal/aboutUs#gsjj}">公司简介</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/aboutUs#business}">业务范围</a>
+						<a th:href="@{/portal/aboutUs#ywfw}">业务范围</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/aboutUs#honor}">荣誉资质</a>
+						<a th:href="@{/portal/aboutUs#zzry}">资质荣誉</a>
 					</p>
 					<p>
-						<a th:href="@{/portal/aboutUs#development}">发展历程</a>
+						<a th:href="@{/portal/aboutUs#fzlc}">发展历程</a>
 					</p>
 				</li>
 			</ol>
@@ -211,24 +214,24 @@
                     </li>
                     <li th:class="${subM}=='apply'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/patent}">技术交易</a>
+                        <a th:href="@{/portal/service/patent}">知产申请</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">科技传播</a>
+                        <a th:href="@{/portal/service/serviceIndex}">知产运用</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='adviser'?active:''" >
                        <div>
-                         <a th:href="@{/portal/adviser}">科技咨询</a>
+                         <a th:href="@{/portal/adviser}">知产顾问</a>
                        </div>
                     </li>
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
-	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">科技金融</a>
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">技术交易</a>
 	 						<!-- <ol class="subnavigation">
 	                            <li>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
@@ -241,12 +244,12 @@
                     </li>
 					<li th:class="${subM}=='safeguarding'?active:''" >
 						<div>
-							<a th:href="@{/portal/service/safeguarding}">维权</a>
+							<a th:href="@{/portal/service/safeguarding}">法律维权</a>
 						</div>
 					</li>
 					<li th:class="${subM}=='eventPlanning'?active:''" >
 						<div>
-							<a th:href="@{/portal/eventPlanning}" >活动策划</a>
+							<a th:href="@{/portal/eventPlanning}" >关于技淘</a>
 						</div>
 					</li>
                      <!-- <li th:class="${subM}=='special'?active:''" >
@@ -294,67 +297,128 @@
 	</th:block>
 
 	<th:block th:fragment="copyright">
-	<div id="bottom">
-			<div class="bottom">
-				<div class="bottom_text">
-					<div class="text_top">
-						<a th:href="@{/portal/aboutUs}">关于公司/</a>
-						<a th:href="@{/portal/contactUs}">联系我们</a>
-						<p> Copyright &copy 2016-2025 科德 版权所有 <a href="https://beian.miit.gov.cn/" target="_blank">湘ICP备15019731号</a>
-							-2 技术支持:阿凡提信息科技(湖南)股份有限公司</p>
+		<div class="newbottom">
+			<div class="newbottom_count">
+				<div class="newbottom_cleft">
+					<div class="newbottom_clitem">
+						<div class="newbottom_clitit">知产申请</div>
+						<a href="/portal/service/patent#zxfb">
+							<div class="newbottom_clitxt">最新发布</div>
+						</a>
+						<a href="/portal/service/patent#zlfw">
+							<div class="newbottom_clitxt">专利服务</div>
+						</a>
+						<a href="/portal/service/patent#sbfw">
+							<div class="newbottom_clitxt">商标服务</div>
+						</a>
+						<a href="/portal/service/patent#bqfw">
+							<div class="newbottom_clitxt">版权服务</div>
+						</a>
+						<a href="/portal/service/patent#zcbk">
+							<div class="newbottom_clitxt">知产百科</div>
+						</a>
 					</div>
-					<div class="text_center">
-						<div class="cont_left" style="width: 365px">
-						<div style=" display: none;"></div>
-							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt="" style="margin-left: 155px;"/>
-							<p>湖南省长沙市岳麓区茶子山东路湘江财富金融中心D栋12层</p>
-						</div>
-						<div class="cont_center" style="margin-left: 110px;">
-						<div style=" display: none;"></div>
-							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
-							<p>合作电话:0731-89907207</p>
-							<p>400-8800-962</p>
-						</div>
-						<div class="cont_right android"  style="margin-left: 200px;">
-							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
-							<p>Android版</p>
-						</div>
-						<div class="cont_right ios" style="margin-right: 5px;">
-						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="" style="width: 81px;height: 78px ;"/>
-						<p>IOS版</p >
-						</div>
-						<div class="cont_right">
-							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
-							<p>微信公众号</p>
-						</div>
+					<div class="newbottom_clitem">
+						<div class="newbottom_clitit">知产运用</div>
+						<a href="/portal/service/serviceIndex#Md2">
+							<div class="newbottom_clitxt">品牌建设</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md3">
+							<div class="newbottom_clitxt">市场开拓</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md4">
+							<div class="newbottom_clitxt">政府扶持</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md5">
+							<div class="newbottom_clitxt">减税免税</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md6">
+							<div class="newbottom_clitxt">融资租售</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md7">
+							<div class="newbottom_clitxt">攻防利器</div>
+						</a>
+						<a href="/portal/service/serviceIndex#Md7">
+							<div class="newbottom_clitxt">他山己用</div>
+						</a>
+					</div>
+					<div class="newbottom_clitem">
+						<div class="newbottom_clitit">知产交易</div>
+						<a href="/portal/technologyTrading/achievementList">
+							<div class="newbottom_clitxt">技术成果</div>
+						</a>
+						<a href="/portal/technologyTrading/demandList">
+							<div class="newbottom_clitxt">技术需求</div>
+						</a>
+						<a href="/portal/service/patent">
+							<div class="newbottom_clitxt">交易政策</div>
+						</a>
+						<a href="/portal/adviser">
+							<div class="newbottom_clitxt">咨询顾问</div>
+						</a>
 					</div>
-					<div class="text_bottom">
-						<p>友情链接</p>
-						<a href="http://www.chinaconsult.org.cn/" target="_blank">中国科协/</a>
-						<a href="http://kjt.hunan.gov.cn/" target="_blank">湖南省科技厅/</a>
-						<a href="http://kjj.changsha.gov.cn/" target="_blank">长沙市科技局/</a>
-						<a href=" https://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
-						<a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
-						<a href="http://www.nosta.gov.cn/" target="_blank">国家科技成果奖励办/</a>
-						<a href="https://www.tech110.net/" target="_blank">国家科技成果网/</a>
-						<a href="http://www.hnast.org.cn/" target="_blank">湖南省科学技术协会/</a>
-						<!-- <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a> -->
-						<a href="http://gxt.hunan.gov.cn/" target="_blank">湖南工业和信息化厅/</a>
-						<a href="http://kyy.hnu.edu.cn/" target="_blank">湖南大学科学技术研究院/</a>
-						<a href="http://kjt.gxzf.gov.cn/" target="_blank">广西省科技厅/</a>
-						<a href="http://kjt.nmg.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
-						<!-- <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a> -->
-						<a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
-						<a href="https://www.cnic.cn/front/pc.html?_=1608531541135#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
-						<!-- <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a> -->
-						<a href="https://www.cast.org.cn/col/col404/" target="_blank">中国科协创新创业服务中心/</a>
-						<a href="http://kjt.hubei.gov.cn" target="_blank">湖北省科技厅/</a>
-						<a href="http://gdstc.gd.gov.cn/" target="_blank">广东省科技厅/</a>
-						<a href="http://kjt.henan.gov.cn/" target="_blank">河南省科技厅/</a>
-						<a href="https://ctmht.chinatorch.org.cn/admin/login" target="_blank">技术合同登记官网</a>
+					<div class="newbottom_clitem">
+						<div class="newbottom_clitit">实用工具</div>
+						<a href="/portal/technologyTrading/achievementList">
+							<div class="newbottom_clitxt">智能匹配</div>
+						</a>
+						<a href="/portal/evaluation/evaluate">
+							<div class="newbottom_clitxt">在线评估</div>
+						</a>
+						<a href="/portal/technologyTrading/demandList">
+							<div class="newbottom_clitxt">精准匹配</div>
+						</a>
+						<a href="/portal/service/patent">
+							<div class="newbottom_clitxt">深度挖掘</div>
+						</a>
+						<a href="/portal/adviser">
+							<div class="newbottom_clitxt">全程跟进</div>
+						</a>
+					</div>
+					<div class="newbottom_clitem">
+						<div class="newbottom_clitit">关于技淘</div>
+						<a href="/portal/aboutUs#gsjj">
+							<div class="newbottom_clitxt">公司简介</div>
+						</a>
+						<a href="/portal/aboutUs#ywfw">
+							<div class="newbottom_clitxt">业务范围</div>
+						</a>
+						<a href="/portal/aboutUs#zzry">
+							<div class="newbottom_clitxt">资质荣誉</div>
+						</a>
+						<a href="/portal/aboutUs#fzlc">
+							<div class="newbottom_clitxt">发展历程</div>
+						</a>
 					</div>
 				</div>
+				<div class="newbottom_cright">
+					<div class="newbottom_critem">
+						<img class="newbottom_cricode" th:src="${portalHost + '/img/erweima.jpg'}" alt="" />
+						微信公众号
+					</div>
+					<div class="newbottom_critem">
+						<img class="newbottom_cricode" th:src="${portalHost + '/img/erweima_android.jpg'}" alt="" />
+						Android版
+					</div>
+					<div class="newbottom_critem">
+						<img class="newbottom_cricode" th:src="${portalHost + '/img/erweima_iphone.png'}" alt="" />
+						IOS版
+					</div>
+				</div>
+			</div>
+			<div class="newbottom_info">
+				<div class="newbottom_iadress">
+					<img class="newbottom_icon" th:src="${portalHost + '/img/dw.png'}" alt="" />
+					&nbsp;公司地址:长沙市岳麓区茶子山东路湘江财富金融中心D栋12层
+				</div>
+				<div class="newbottom_iphone">
+					<img class="newbottom_icon" th:src="${portalHost + '/img/tel.png'}" alt="" />
+					&nbsp;合作电话:0731-89907207&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;400-8800-962
+				</div>
 			</div>
+			<div>Copyright © 2016-2022 科德 版权所有
+				<a href="https://beian.miit.gov.cn/" target="_blank">湘ICP备15019731号 -2</a>
+				技术支持:阿凡提信息科技(湖南)股份有限公司</div>
 		</div>
 		<div class="pub_fix">
 			<ul>
@@ -363,11 +427,11 @@
 						<span class="glyphicon glyphicon-plane"></span>
 					</a>
 				</li>
-				<li>
-					<a onclick="openZoosUrl('chatwin');">
-						<span class="glyphicon glyphicon-user"></span>
-					</a>
-				</li>
+<!--				<li>-->
+<!--					<a onclick="openZoosUrl('chatwin');">-->
+<!--						<span class="glyphicon glyphicon-user"></span>-->
+<!--					</a>-->
+<!--				</li>-->
 				<li class="phonefix">
 					<a>
 						<span class="glyphicon glyphicon-phone-alt"></span>

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


+ 27 - 26
src/main/webapp/WEB-INF/views/portal/eventPlanning.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<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})">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -8,37 +9,37 @@
     <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
     <link th:href="${portalHost + '/eventPlanning.css'}" rel="stylesheet">
-
 </head>
 
 <body>
-    <div class="app">
-        <div th:replace="common::nav('','eventPlanning')"></div>
-        <!-- 主体内容 -->
-        <div class="news main">
-            <div class="container">
-                <!-- 新闻列表 -->
+<div th:replace="common::nav('','eventPlanning')"></div>
+<div class="app">
+    <!-- 主体内容 -->
+    <div class="news main">
+        <div class="container">
+            <!-- 新闻列表 -->
 
-                <ul class="newslist">
+            <ul class="newslist">
 
-                </ul>
-                <!-- 新闻列表  end -->
-                <!-- 分页 -->
-                <div class="page_1"></div>
-                <!-- 分页 end -->
-            </div>
+            </ul>
+            <!-- 新闻列表  end -->
+            <!-- 分页 -->
+            <div class="page_1"></div>
+            <!-- 分页 end -->
         </div>
-        <!-- 主体内容  end -->
-        <!-- 底部 -->
-        <footer>
-            <div th:replace="common::copyright"></div>
-            <div th:replace="common::login"></div>
-        </footer>
     </div>
-        <div th:replace="common::footer(~{::script})">
-            <script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
-            <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-            <script type="text/javascript" th:src="${portalHost + '/eventPlanning.js'}"></script>
-        </div>
+    <!-- 主体内容  end -->
+</div>
+<!-- 公共底部  省略 -->
+<footer>
+    <div th:replace="common::copyright"></div>
+    <div th:replace="common::login"></div>
+</footer>
+<div th:replace="common::footer(~{::script})">
+    <script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
+    <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+    <script type="text/javascript" th:src="${portalHost + '/eventPlanning.js'}"></script>
+</div>
 </body>
+
 </html>

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

@@ -51,179 +51,275 @@
 			<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 		</div>
 
-	<!-- 	<div class="indexSearch">
-			<ul class="jumpType">
-				<li class="active">成果</li>
-				<li>需求</li>
-				<li>专利</li>
-				<li>政策</li>
-				<li>项目</li>
-			</ul>
-			<div class="search-inp">
-				<div class="input-group searchDiv">
-					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
-					<img th:src="${portalHost+'/img/newMenu/searchImg.png'}" alt="" class="searchImg">
 
-				</div>
-				 <a  th:href="@{/portal/assessment}" class="zaixian">在线评估</a>
-
-
-				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate" class="gaoqi">高企自评</a>
-			</div>
-			<ul class="jump">
-				<li>
-					<a href="/portal/thinkTank/policyList?type=1">政策</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=0">资讯</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=99">技淘观点</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=98">知产百科</a>
-				</li>
-			</ul>
-			<span class="apply head_login">申请会员</span>
-		</div> -->
 
 	<!-- 主体内容区域 -->
-	<div id="terrace">
-			<div class="terrace_title">
+	<div class="newexhibition">
+		<img class="newexhibition_img" th:src="${portalHost+'/img/newexhibition/cgzs.png'}" alt="" />
+		<div class="newexhibition_count">
+			<div class="newexhibition_citem1"><span>电子信息</span></div>
+			<div class="newexhibition_citem2"><span>新材料</span></div>
+			<div class="newexhibition_citem3"><span>资源<br>与环境</span></div>
+			<div class="newexhibition_citem4"><span>成果展示</span></div>
+			<div class="newexhibition_citem5"><span style="width: 72px;">先进制造与自动化</span></div>
+			<div class="newexhibition_citem6"><span>找技术</span></div>
+			<div class="newexhibition_citem7"><span>航天航空</span></div>
+			<div class="newexhibition_citem8"><span style="width: 54px;">生物与新医药</span></div>
+			<div class="newexhibition_citem9"><span style="width: 54px;">新能源及节能</span></div>
+			<div class="newexhibition_citem10"><span style="width: 54px;">高技术服务业</span></div>
+		</div>
+	</div>
 
-				<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" />
+	<!-- 知识产权新运用服务平台 -->
+	<div class="newapply">
+		<div class="newtitle">
+			<div class="t1"></div>
+			<div class="t2"></div>
+			<div class="t3"></div>
+			<span class="text">知识产权新运用服务平台</span>
+			<div class="t3"></div>
+			<div class="t2"></div>
+			<div class="t1"></div>
+		</div>
+		<div class="newapply_main">
+			<div class="newapply_left" >
+				<a th:href="'/portal/service/patentList?secondId='+${p0.topLevelId}" th:each="p0,pcStatus:${patentCategory}">
+					<div class="newapply_item">
+						<img th:src="${portalHost+'/img/newapply/ptczl.png'}" alt="" th:if="${pcStatus.index}==0"/>
+						<img th:src="${portalHost+'/img/newapply/rzsq.png'}" alt="" th:if="${pcStatus.index}==1"/>
+						<img th:src="${portalHost+'/img/newapply/syxx.png'}" alt="" th:if="${pcStatus.index}==2"/>
+						<img th:src="${portalHost+'/img/newapply/sbzc.png'}" alt="" th:if="${pcStatus.index}==3"/>
+						<img th:src="${portalHost+'/img/newapply/fmzl.png'}" alt="" th:if="${pcStatus.index}==4"/>
+						<img th:src="${portalHost+'/img/newapply/wgzl.png'}" alt="" th:if="${pcStatus.index}==5"/>
+						<span th:text="${p0.topLevel}"> 发明专利</span>
+					</div>
+				</a>
 			</div>
-			<!--
-			<div class="terrace_cont">
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>智慧</h4>
-						<p>海量智力成果认知您的需求</p>
+			<div class="newapply_right">
+				<div class="newapply_user">
+					<img class="newapply_userimg" th:src="${portalHost+'/img/newapply/avartr.png'}" alt="" />
+					<div class="newapply_userinfo">
+						<div class="newapply_username">您好,欢迎来到技淘!</div>
+						<div>
+							<a th:href="@{/user/signIn}"><button class="newapply_res" th:if="!${isLogin}">免费注册</button></a>
+							<button class="newapply_log head_login" th:if="!${isLogin}" href="javascript:;" >一键登录</button>
+						</div>
+						<div th:if="${isLogin}" class="signin">
+							<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
+							   th:text="${#strings.isEmpty(userName)?'个人中心':userName}" style="color: #fff; font-size: 20px ">个人中心</a>
+							<a th:href="${basePath + '/user/logout'}" style="color: #fff; font-size: 20px ">[退出]</a>
+						</div>
 					</div>
 				</div>
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>合伙</h4>
-						<p>秉承十七载荣赢数万客户</p>
-					</div>
-				</div><div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>社区</h4>
-						<p>严选数千位专家顾问答疑解惑</p>
-					</div>
+				<div class="newapply_list">
+					<a href="http://124.232.146.72:7015/#/login?redirect=%2Findex">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/yffy.png'}" alt="" />
+							<span class="newapply_ltxt">研发费用归集</span>
+						</div>
+					</a>
+					<a href="http://c.tianchuang.xin/#/site-home">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/xypg.png'}" alt="" />
+							<span class="newapply_ltxt">信用评估</span>
+						</div>
+					</a>
+					<a href="http://218.77.58.154:8888/#/login">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jsxx.png'}" alt="" />
+							<span class="newapply_ltxt">技术信息舆情</span>
+						</div>
+					</a>
+					<a href="https://www.ebaoquan.org/">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jsjybz.png'}" alt="" />
+							<span class="newapply_ltxt">技术交易保障</span>
+						</div>
+					</a>
+					<a th:href="@{/portal/evaluation/evaluate}">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/gqzx.png'}" alt="" />
+							<span class="newapply_ltxt">高企在线评估</span>
+						</div>
+					</a>
+					<a th:href="@{/user/signIn}">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/rzffs.png'}" alt="" />
+							<span class="newapply_ltxt">入驻为服务商</span>
+						</div>
+					</a>
+					<a th:href="@{/portal/technologyTrading/achievementList}">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jscg.png'}" alt="" />
+							<span class="newapply_ltxt">技术成果展示</span>
+						</div>
+					</a>
+					<a th:href="@{/portal/technologyTrading/demandList}">
+						<div class="newapply_listitem">
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jsxq.png'}" alt="" />
+							<span class="newapply_ltxt">技术需求展示</span>
+						</div>
+					</a>
+
 				</div>
-			</div>-->
+			</div>
 		</div>
-		<div id="apply">
-			<div class="apply">
-				<div class="apply_left">
-					<a >
-						<img th:src="${portalHost+'/img/indedImg/inded15.jpg'}" alt="" />
-					</a>
+	</div>
+
+	<!-- 知识百科--政策资讯 -->
+	<div class="newinfor">
+		<!-- 知识百科 -->
+		<div class="newinfor_knowledge">
+			<div class="newinfor_ktop">
+				<div class="newtitle" style="margin-bottom: 0;">
+					<div class="t1"></div>
+					<div class="t2"></div>
+					<div class="t3"></div>
+					<span class="text">知产百科</span>
+					<div class="t3"></div>
+					<div class="t2"></div>
+					<div class="t1"></div>
 				</div>
-				<div class="apply_right">
-					<div th:each="p0,pcStatus:${patentCategory}">
-						<a th:href="'/portal/service/patentList?secondId='+${p0.topLevelId}">
-							<img th:src="${portalHost+'/img/indedImg/inded20.jpg'}" alt="" th:if="${pcStatus.index}==0"/>
-							<img th:src="${portalHost+'/img/indedImg/inded21.jpg'}" alt="" th:if="${pcStatus.index}==1"/>
-							<img th:src="${portalHost+'/img/indedImg/inded22.jpg'}" alt="" th:if="${pcStatus.index}==2"/>
-							<img th:src="${portalHost+'/img/indedImg/inded23.jpg'}" alt="" th:if="${pcStatus.index}==3"/>
-							<img th:src="${portalHost+'/img/indedImg/inded24.jpg'}" alt="" th:if="${pcStatus.index}==4"/>
-							<img th:src="${portalHost+'/img/indedImg/inded25.jpg'}" alt="" th:if="${pcStatus.index}==5"/>
-							<h4 th:text="${p0.topLevel}"> 发明专利</h4>
-						</a>
+				<a href="/portal/thinkTank/policyList?type=98">
+					<div class="newinfor_more">
+						查看更多 >
+					</div>
+				</a>
+			</div>
+			<div class="newinfor_klist">
+				<a th:href="@{/portal/news/newsDetail(id=${e.id},type=1)}" th:each="e:${encyclopedias}">
+					<div class="newinfor_klitem">
+						<img class="newinfor_kliimg"  th:src="${avatarUploadHost+e.titleImg}" alt="" />
+						<div class="newinfor_klicount">
+							<div class="newinfor_klictit" th:text="${#strings.abbreviate(e.title,18)}">专家</div>
+							<div class="newinfor_klictxt" th:text="${#strings.abbreviate(e.summary,65)}">
+								当前
+							</div>
+							<div class="newinfor_klictime" th:text="${#dates.format(e.releaseDate,'yyyy-MM-dd')}">2021-03-24</div>
+						</div>
 					</div>
+				</a>
+			</div>
+		</div>
+		<!-- 政策资讯 -->
+		<div class="newinfor_policy">
+			<div class="newinfor_ptop">
+				<div class="newtitle" style="margin-bottom: 0;">
+					<div class="t1"></div>
+					<div class="t2"></div>
+					<div class="t3"></div>
+					<span class="text">政策资讯</span>
+					<div class="t3"></div>
+					<div class="t2"></div>
+					<div class="t1"></div>
 				</div>
+				<a href="/portal/thinkTank/policyList?type=0">
+					<div class="newinfor_more">
+						查看更多 >
+					</div>
+				</a>
+			</div>
+			<div class="newinfor_plist">
+				<a th:href="@{/portal/news/newsDetail(id=${n.id},type=1)}" th:each="n:${news}">
+					<div class="newinfor_plitem">
+						<div class="newinfor_plitit">
+							<span style="color:#1566ED ;">&nbsp;•&nbsp;</span>
+							<span th:text="${#strings.abbreviate(n.title,18)}">政府采购</span>
+						</div>
+						<div class="newinfor_plitime" th:text="${#dates.format(n.releaseDate,'yyyy-MM-dd')}">2021-03-24</div>
+					</div>
+				</a>
 			</div>
-
 		</div>
-		<div class="container">
-		<div class="RecommendTitle">
-			<h2>政策资讯</h2>
-			<span></span>
+	</div>
+
+	<!-- 20年经验 -->
+	<div class="newbanner">
+		<img class="newbanner_img" th:src="${portalHost+'/img/newbanner/bg.png'}" alt="" />
+		<div class="newbanner_large">20年知识产权运用经验&nbsp;&nbsp;&nbsp;拥有咨询业甲级资质</div>
+		<div class="newbanner_small">国家高新技术企业&nbsp;&nbsp;&nbsp;国家技术转移示范机构</div>
+	</div>
+
+	<!-- 热门项目 -->
+	<div class="newhotitems">
+		<div class="newtitle">
+			<div class="t1"></div>
+			<div class="t2"></div>
+			<div class="t3"></div>
+			<span class="text">热门项目</span>
+			<div class="t3"></div>
+			<div class="t2"></div>
+			<div class="t1"></div>
 		</div>
-		<div class="news">
-			<div class="consultation"  style="width: 1200px;">
-				<a href="/portal/thinkTank/policyList?type=0" style="color: black;position: relative;left: 1120px;font-size: 16px;">更多&gt;&gt;</a>
-				<ul style="display: flex; flex-wrap: wrap;">
+		<div class="newhotitems_hlist">
+			<div class="newhotitems_hlitem" th:each="p,pStatus:${projects}">
+				<div class="newhotitems_hlitit">
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot010.png'}" alt="" th:if="${pStatus.index}==0"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot020.png'}" alt="" th:if="${pStatus.index}==1"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot030.png'}" alt="" th:if="${pStatus.index}==2"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot040.png'}" alt="" th:if="${pStatus.index}==3"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot050.png'}" alt="" th:if="${pStatus.index}==4"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot060.png'}" alt="" th:if="${pStatus.index}==5"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot070.png'}" alt="" th:if="${pStatus.index}==6"/>
+					<img style="width: 23px;height: 20px;" th:src="${portalHost+'/img/newhotitems/hot080.png'}" alt="" th:if="${pStatus.index}==7"/>
 
-					<li th:each="n:${news}" style="width: 600px;">
-						<a th:href="@{/portal/news/newsDetail(id=${n.id},type=1)}">
-							<div class="newTxt">
-								<h5 th:text="${#strings.abbreviate(n.title,18)}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
-								<p th:text="${#strings.abbreviate(n.summary,65)}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
-							</div>
-						</a>
-					</li>
-				</ul>
+					<span th:text="${'&nbsp;'+p.name}">&nbsp;创建高新技术企业培育体系</span>
+				</div>
+				<div class="newhotitems_hlitxt" th:text="${p.advertisement}==null or ${p.advertisement}==''?'暂无简介':${#strings.abbreviate(p.advertisement,30)}">省财政给予10-500万奖励</div>
+				<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">
+					<div class="newhotitems_hlibt">了解详情</div>
+				</a>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot01.png'}" alt="" th:if="${pStatus.index}==0"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot02.png'}" alt="" th:if="${pStatus.index}==1"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot03.png'}" alt="" th:if="${pStatus.index}==2"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot04.png'}" alt="" th:if="${pStatus.index}==3"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot05.png'}" alt="" th:if="${pStatus.index}==4"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot06.png'}" alt="" th:if="${pStatus.index}==5"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot07.png'}" alt="" th:if="${pStatus.index}==6"/>
+				<img class="newhotitems_hliicon" th:src="${portalHost+'/img/newhotitems/hot08.png'}" alt="" th:if="${pStatus.index}==7"/>
 			</div>
+
 		</div>
 	</div>
-		<!-- <div id="wield">
-			<div class="terrace_title">
-				<img th:src="${portalHost+'/img/indedImg/inded4.png'}" alt="" />
-			</div>
-			<div class="wield_cont">
-				<div class="video">
-					<video id="video1" controls="true" controlslist="nodownload">
-						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 "  type="video/mp4">
-						<source th:src="${vurl == null? 'http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4': videoServer+vurl}"  type="video/mp4">
 
-						您的浏览器不支持 HTML5 video 标签。
-					</video>
-				</div>
-				<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
-			</div>
-				<div class="moreVideo">
-				<a href="/portal/video.html">查看更多视频 >></a>
-			</div>
-		</div> -->
-		<!-- <div class="brands">
-			<a th:href="@{/portal/service/brandBuild}">
-			<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
-			</a>
+	<!-- 热门应用 -->
+	<div class="newapplications">
+		<div class="newtitle">
+			<div class="t1"></div>
+			<div class="t2"></div>
+			<div class="t3"></div>
+			<span class="text">热门应用</span>
+			<div class="t3"></div>
+			<div class="t2"></div>
+			<div class="t1"></div>
 		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/marketOpen}">
-			<img th:src="${portalHost+'/img/indedImg/inded7.png'}" alt="" />
-			</a>
-			<div class="brandsDiv">
-				<img th:src="${portalHost+'/img/indedImg/inded31.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded32.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded33.jpg'}" alt="" />
+		<div class="newapplications_count">
+			<div class="newapplications_one">
+				<img class="newapplications_oneback" th:src="${portalHost+'/img/newapplications/app.png'}" alt="" />
 			</div>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/governmentSupport}">
-			<img th:src="${portalHost+'/img/indedImg/inded8.png'}" alt="" />
+			<a href="/portal/service/patentDetail?id=1db41f68-9bff-4e2c-af6e-accefc9f881a">
+				<div class="newapplications_two">
+					<img class="newapplications_twoback" th:src="${portalHost+'/img/newapplications/gjzl.png'}" alt="" />
+					<div class="newapplications_twotit">国际专利</div>
+					<div class="newapplications_twotxt">国际专利为您企业走出国门保驾护航!</div>
+				</div>
 			</a>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/taxFinance}">
-			<img th:src="${portalHost+'/img/indedImg/inded9.png'}" alt="" />
+			<a href="/portal/service/patentDetail?id=726e63b5-f36d-4b24-a8ef-b8bb4b1cf42b">
+				<div class="newapplications_two">
+					<img class="newapplications_twoback" th:src="${portalHost+'/img/newapplications/bqzr.png'}" alt="" />
+					<div class="newapplications_twotit">版权转让</div>
+					<div class="newapplications_twotxt">各类优质著作权转让,为让企业发展助力!</div>
+				</div>
 			</a>
-			<div>
-				<img th:src="${portalHost+'/img/indedImg/inded34.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded35.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded36.jpg'}" alt="" />
-			</div>
-		</div> -->
-		<div id="hotProject">
-			<div class="terrace_title">
-				<img th:src="${portalHost+'/img/indedImg/inded10.png'}" alt="" />
-			</div>
-			<div class="hotProject_cont" >
-				<div th:each="p,pStatus:${projects}">
-					<img th:src="${p.maxImgUrl}==null or ${p.maxImgUrl}==''?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
-					<h3 th:text="${p.name}">高新认定</h3>
-					<p th:text="${p.advertisement}==null or ${p.advertisement}==''?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
-					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
+			<a href="/portal/service/patentDetail?id=891cf7c6-5a03-4887-a8fc-1e77c867e528">
+				<div class="newapplications_two">
+					<img class="newapplications_twoback" th:src="${portalHost+'/img/newapplications/pctzl.png'}" alt="" />
+					<div class="newapplications_twotit">PTC专利</div>
+					<div class="newapplications_twotxt">一种国际体系的专利申请</div>
 				</div>
-			</div>
+			</a>
 		</div>
+	</div>
 
 
 	<footer>

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