Browse Source

修改冲突文件

wanghui 8 years ago
parent
commit
17d1e10fc5

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

@@ -185,12 +185,10 @@ public class WebpageController extends BaseController {
 			}
 		}
 		
-		
-
 		/* 查询相关智者信息 */
 		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
 		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
-		if (userPartner.size() >= 4) {
+		if (userPartner != null && userPartner.size() >= 4) {
 			int index = (int) new Random().nextInt(userPartner.size() - 3);
 			reuserPartner.add(userPartner.get(index));
 			reuserPartner.add(userPartner.get(index + 1));
@@ -573,5 +571,29 @@ public class WebpageController extends BaseController {
 		}
 	}
 	
-	
+	/**
+	 * 会员介绍
+	 * @param request
+	 * @param modelview
+	 * @param pageType (0:专利产品页,1:技术成果页面,2:技术需求页面)
+	 * @param keyWord
+	 *   
+	 * @return
+	 */
+	@RequestMapping(value="/portal/search/keyword" ,method = RequestMethod.POST)
+	private ModelAndView searchListByKeyword (HttpServletRequest request, ModelAndView modelview ,Integer pageType ,String keyWord) {
+		modelview.addObject("keyWord", keyWord);
+		System.out.println("进来没有");
+		/*if (null != pageType && pageType == 2) {
+			System.out.println("专利产品页面");
+			modelview.setViewName("/portal/technologyTrading/demand");
+		}else if (null != pageType && (pageType == 1 ||pageType==0)) {
+			System.out.println("技术成果页面");
+			modelview.setViewName("/portal/technologyTrading/achievement");
+		}else {
+			modelview.setViewName("/portal/technologyTrading/achievement");
+		}*/
+		/*modelview.setViewName("/portal/technologyTrading/achievement");*/
+		return new ModelAndView("/portal/technologyTrading/achievement","keyWord", keyWord);
+	}
 }

+ 139 - 140
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -1,141 +1,140 @@
-package com.goafanti.news.controller;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.goafanti.banners.enums.BannersType;
-import com.goafanti.banners.service.BannersService;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseController;
-import com.goafanti.common.model.Banners;
-import com.goafanti.common.model.News;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.news.bo.NewsPortalList;
-import com.goafanti.news.enums.NewsType;
-import com.goafanti.news.service.NewsService;
-
-@Controller
-public class NewsController extends BaseController {
-	@Resource
-	NewsService newsService;
-	@Resource
-	private BannersService bannersService;
-
-	/**
-	 * 策源地
-	 * 
-	 * @param request
-	 * @param modelview
-	 * @return
-	 */
-	@RequestMapping(value = "/portal/news/newsIndex", method = RequestMethod.GET)
-	public ModelAndView portalNewsNewsIndex(HttpServletRequest request, ModelAndView modelview, String noCache) {
-		modelview.setViewName("/portal/news/newsIndex");
-		if (StringUtils.equals(noCache, "clear")) {
-			newsService.cleanList();
-		}
-		String domainName = request.getServerName();
-		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2, domainName, false));
-		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2, domainName, false));
-		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3, domainName, false));
-		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, false));
-		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3, domainName, false));
-		handleBanners(modelview, BannersType.CE_YUAN_DI);
-		return modelview;
-	}
-
-	/**
-	 * 新闻详情
-	 */
-	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
-	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/news/newsDetails");
-		return modelview;
-	}
-
-	/**
-	 * 新闻详情APP
-	 */
-	@RequestMapping(value = "/portal/news/newsDetailApp", method = RequestMethod.GET)
-	public ModelAndView portalNewsNewsDetailApp(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/news/newsDetailApp");
-		return modelview;
-	}
-
-	/**
-	 * 新闻详情列表
-	 */
-	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
-	@ResponseBody
-	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
-			String keyword) {
-		Result res = new Result();
-		Integer pNo = 1, pSize = 4;
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword));
-		return res;
-	}
-
-	/**
-	 * 新闻详情
-	 */
-	@RequestMapping(value = "/portal/news/detailInfo", method = RequestMethod.GET)
-	@ResponseBody
-	public Result portalNewsDetail(Long id) {
-		Result res = new Result();
-		if (null == id) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻ID"));
-			return res;
-		}
-
-		/* newsService.portalNewsList(6,1, type,hot,provinceId,keyword) */
-
-		res.setData(newsService.findNewsDetail(id));
-		return res;
-	}
-
-	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
-	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id) {
-		modelview.setViewName("/portal/news/newsDetail");
-		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
-		News newsDetail = newsService.findNewsDetail(id);
-		Object news = newsList.getList().get(0);
-		SimpleDateFormat fmt = new SimpleDateFormat();
-		newsDetail.setCreateTimeS(fmt.format(newsDetail.getCreateTime()));
-		@SuppressWarnings("unchecked")
-		List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
-		for (NewsPortalList n : la) {
-			String createTimeFormattedDate = n.getCreateTimeFormattedDate();
-			n.setDataS(createTimeFormattedDate);
-		}
-		modelview.addObject("newsDetail", newsDetail);
-		modelview.addObject("newsList", newsList.getList());
-		modelview.addObject("news", news);
-		return modelview;
-
-	}
-
-	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
-		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
-		if (!banners.isEmpty()) {
-			modelview.addObject("banners", banners);
-		}
-	}
-
+package com.goafanti.news.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.goafanti.banners.enums.BannersType;
+import com.goafanti.banners.service.BannersService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Banners;
+import com.goafanti.common.model.News;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.news.bo.NewsPortalList;
+import com.goafanti.news.enums.NewsType;
+import com.goafanti.news.service.NewsService;
+
+@Controller
+public class NewsController extends BaseController {
+	@Resource
+	NewsService newsService;
+	@Resource
+	private BannersService bannersService;
+
+	/**
+	 * 策源地
+	 * 
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/news/newsIndex", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsIndex(HttpServletRequest request, ModelAndView modelview, String noCache) {
+		modelview.setViewName("/portal/news/newsIndex");
+		if (StringUtils.equals(noCache, "clear")) {
+			newsService.cleanList();
+		}
+		String domainName = request.getServerName();
+		modelview.addObject("kjkx", newsService.findNewsList(0, NewsType.KJZX.getCode(), 2, domainName, false));
+		modelview.addObject("jtdt", newsService.findNewsList(0, NewsType.JTDT.getCode(), 2, domainName, false));
+		modelview.addObject("zfwl", newsService.findNewsList(0, NewsType.ZFWL.getCode(), 3, domainName, false));
+		modelview.addObject("gjzc", newsService.findNewsList(0, NewsType.GJZC.getCode(), 3, domainName, false));
+		modelview.addObject("dfzc", newsService.findNewsList(0, NewsType.DFZC.getCode(), 3, domainName, false));
+		handleBanners(modelview, BannersType.CE_YUAN_DI);
+		return modelview;
+	}
+
+	/**
+	 * 新闻详情
+	 */
+	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetails");
+		return modelview;
+	}
+
+	/**
+	 * 新闻详情APP
+	 */
+	@RequestMapping(value = "/portal/news/newsDetailApp", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsDetailApp(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetailApp");
+		return modelview;
+	}
+
+	/**
+	 * 新闻详情列表
+	 */
+	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
+	@ResponseBody
+	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
+			String keyword) {
+		Result res = new Result();
+		Integer pNo = 1, pSize = 4;
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword));
+		return res;
+	}
+
+	/**
+	 * 新闻详情
+	 */
+	@RequestMapping(value = "/portal/news/detailInfo", method = RequestMethod.GET)
+	@ResponseBody
+	public Result portalNewsDetail(Long id) {
+		Result res = new Result();
+		if (null == id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新闻ID"));
+			return res;
+		}
+
+		/* newsService.portalNewsList(6,1, type,hot,provinceId,keyword) */
+
+		res.setData(newsService.findNewsDetail(id));
+		return res;
+	}
+
+	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
+	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id) {
+		modelview.setViewName("/portal/news/newsDetail");
+		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
+		News newsDetail = newsService.findNewsDetail(id);
+		Object news = newsList.getList().get(0);
+		SimpleDateFormat fmt = new SimpleDateFormat();
+		newsDetail.setCreateTimeS(newsDetail==null?"":fmt.format(newsDetail.getCreateTime()));
+		@SuppressWarnings("unchecked")
+		List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
+		for (NewsPortalList n : la) {
+			String createTimeFormattedDate = n.getCreateTimeFormattedDate();
+			n.setDataS(createTimeFormattedDate);
+		}
+		modelview.addObject("newsDetail", newsDetail);
+		modelview.addObject("newsList", newsList.getList());
+		modelview.addObject("news", news);
+		return modelview;
+	}
+
+	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
+		if (!banners.isEmpty()) {
+			modelview.addObject("banners", banners);
+		}
+	}
+
 }

File diff suppressed because it is too large
+ 5 - 2
src/main/webapp/WEB-INF/views/common.html


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

@@ -28,28 +28,28 @@
 		<div class="container">
 			<ul>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>6900条</strong>
+					<p>需求数</p>
 				</li>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>20万</strong>
+					<p>成果数</p>
 				</li>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>2万个</strong>
+					<p>专家数</p>
 				</li>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>1200笔</strong>
+					<p>专利交易</p>
 				</li>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>12000家</strong>
+					<p>客户数</p>
 				</li>
 				<li>
-					<strong>46</strong>
-					<p>线下活动</p>
+					<strong>68场</strong>
+					<p>技术对接场次</p>
 				</li>
 			</ul>
 		</div> 		
@@ -57,20 +57,28 @@
  	<div id="active">
 		<div class="coupon rf">
 			<div class="coupon_cont lf">
-				<h2>200元</h2>
-				<p>什么项目满2000减</p>				
+				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+				<h2>科技服务1000元 代金券</h2>
+				<p>有限期至:2017-10-1</p>
+				</a>				
 			</div>
 			<div class="coupon_cont lf">
-				<h2>200元</h2>
-				<p>什么项目满2000减</p>				
+				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+				<h2>上线送大礼,做高新,软著免费(限一个)</h2>
+				<p>有限期至:2017-10-1</p>
+				</a>						
 			</div>
 			<div class="coupon_cont lf">
-				<h2>200元</h2>
-				<p>什么项目满2000减</p>				
+				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+				<h2>专利申请,限时九折(前100个)</h2>
+				<p>有限期至:2017-10-1</p>
+				</a>						
 			</div>
 			<div class="coupon_cont lf">
-				<h2>200元</h2>
-				<p>什么项目满2000减</p>				
+				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+				<h2>100元软著全包(限量100个)</h2>
+				<p>有限期至:2017-10-1</p>
+				</a>								
 			</div>
 		</div>
 		<div class="title">
@@ -79,7 +87,7 @@
 		<div class="line"></div>
 	</div>
 	<div id="product">
-		<div class="caption">精品成果</div>
+		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
 		<div class="content">
 			<div class="cont cont_top1">
 				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
@@ -144,7 +152,7 @@
 		</div>
 	</div>
 	<div id="policy">
-		<div class="captions">政策解读</div>
+		<div class="captions">智政 <a th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a></a></div>
 		<div class="pol_cont">
 			<div class="pol_left">
 				<img th:src="${portalHost+'/img/policy.jpg'}" alt=""/>
@@ -194,31 +202,31 @@
 				<div class="need_imgs">
 					<ul>
 						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa'}">
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />	
 								<p>新型纳米涂料技术</p>
 							</a>
 						</li>
 						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0'}">
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>汽车空调的辅助制冷装置</p>
 							</a>
 						</li>
 						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf'}">
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>高性能铅炭电池</p>
 							</a>
 						</li>
 						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9'}">
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>ABS板材改性工程塑料的配方及研究</p>
 							</a>
 						</li>
 						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d'}">
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
 								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
 								<p>机械领域新型产品或技术</p>
 							</a>

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

@@ -34,7 +34,7 @@
 			</div>
 			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold" />
 			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond" />
-
+			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即申请</a>	
 		</div>
 		<div class="shadow">
 			<img th:src="${portalHost + '/img/shadow7.png'}" alt="" />

+ 68 - 70
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -1,71 +1,69 @@
-<!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 th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-<link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
-</head>
-
-<body>
-	<header>
-		<div th:replace="common::nav('news','newsDetail')"></div>
-	</header>
-	<div id="policyDetail">
-		<div id="policy_content">
-			<div class="content_left" th:each="newsDetail:${newsDetail}">
-				<h3 th:text="${newsDetail.title}?${newsDetail.title}:''"></h3>
-				<div class="small_title">
-					<span>时间:<span th:text="${newsDetail.createTime}?${newsDetail.createTimeS}:''"></span></span>
-					<span>来源:<span th:text="${newsDetail.source}?${newsDetail.source}:行业新闻"></span></span>
-				</div>
-				<div class="content_img">
-					<img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
-				</div>
-				<p  th:text="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
-				</p>
-				<h5 class="text_end">文章来自:</h5>
-				<a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
-				<hr />
-				<h5 >本文关键词:</h5>
-				<span>高新</span> <span>信息</span> <span>技术</span>
-				<hr />
-				<!-- <div class="next_div">
-					<span class="rf">
-						<h5>下一篇:</h5> <a href="#">科技探索</a>
-					</span> <span>
-						<h5>上一篇:</h5> <a href="#">探索科技</a>
-					</span>
-				</div> -->
-				<hr />
-				<h5>推荐文章:</h5>
-				<div th:each="news:${news}">
-				    <span ><a th:href="@{/portal/news/newsDetail(id=${news.id})}"  th:text="${news.title}?${news.title}:'暂无更多内容'"></a></span>
-				</div>
-			</div>
-			<div class="contetn_right" >
-				<div class="right_title">
-					<div>热点资讯</div>
-				</div>
-				<div th:each="newsList:${newsList}">
-					<h5 ><a th:href="@{/portal/news/newsDetail(id=${newsList.id})}"  th:text="${newsList.title}?${newsList.title}:''"></a></h5>
-					 <!-- <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" /> -->
-					<p th:text="${newsList.createTime}?${newsList.DataS}:''"></p>
-				</div>
-			</div>
-		</div>
-	</div>
-	<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 + '/thinkTank/policyDetail.js'}"></script>
-	</div>
-</body>
-
-
+<!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 th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('news','newsDetail')"></div>
+	</header>
+	<div id="policyDetail">
+		<div id="policy_content">
+			<div class="content_left" th:each="newsDetail:${newsDetail}">
+				<h3 th:text="${newsDetail.title}?${newsDetail.title}:''"></h3>
+				<div class="small_title">
+					<span>时间:<span th:text="${newsDetail.createTime}?${newsDetail.createTimeS}:''"></span></span>
+					<span>来源:<span th:text="${newsDetail.source}?${newsDetail.source}:行业新闻"></span></span>
+				</div>
+				<div th:if="${newsDetail.titleImg != null and newsDetail.titleImg !=''}" class="content_img">					
+					<img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
+				</div>
+				<p th:utext="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
+				</p>
+				<h5 class="text_end">文章来自:</h5>
+				<a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
+				<hr />
+				<h5 >本文关键词:</h5>
+				<span>高新</span> <span>信息</span> <span>技术</span>
+				<hr />
+				<!-- <div class="next_div">
+					<span class="rf">
+						<h5>下一篇:</h5> <a href="#">科技探索</a>
+					</span> <span>
+						<h5>上一篇:</h5> <a href="#">探索科技</a>
+					</span>
+				</div> -->
+				<hr />
+				<h5>推荐文章:</h5>
+				<div th:each="news:${news}">
+				    <span ><a th:href="@{/portal/news/newsDetail(id=${news.id})}"  th:text="${news.title}?${news.title}:'暂无更多内容'"></a></span>
+				</div>
+			</div>
+			<div class="contetn_right" >
+				<div class="right_title">
+					<div>热点资讯</div>
+				</div>
+				<div th:each="newsList:${newsList}">
+					<h5 ><a th:href="@{/portal/news/newsDetail(id=${newsList.id})}"  th:text="${newsList.title}?${newsList.title}:''"></a></h5>
+					 <!-- <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" /> -->
+					<p th:text="${newsList.createTime}?${newsList.DataS}:''"></p>
+				</div>
+			</div>
+		</div>
+	</div>
+	<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 + '/thinkTank/policyDetail.js'}"></script>
+	</div>
+</body>
+
+
 </html>

+ 48 - 40
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -31,28 +31,28 @@
 	<div class="carousesmall">
 		<ul class="ct_img_big clear">
 			<li data-index=0><a href=""> <img
-					th:src="${portalHost+'/img/tectbanner1.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner7.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner1.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner7.jpg'}" alt="" />
 			</a></li>
 			<li data-index=1><a href=""> <img
-					th:src="${portalHost+'/img/techbanner2.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner8.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner2.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner8.jpg'}" alt="" />
 			</a></li>
 			<li data-index=2><a href=""> <img
-					th:src="${portalHost+'/img/techbanner3.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner9.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner3.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner9.jpg'}" alt="" />
 			</a></li>
 			<li data-index=3><a href=""> <img
-					th:src="${portalHost+'/img/techbanner4.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner10.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner4.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner10.jpg'}" alt="" />
 			</a></li>
 			<li data-index=4><a href=""> <img
-					th:src="${portalHost+'/img/techbanner5.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner11.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner5.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner11.jpg'}" alt="" />
 			</a></li>
 			<li data-index=5><a href=""> <img
-					th:src="${portalHost+'/img/techbanner6.png'}" alt="" /> <img
-					th:src="${portalHost+'/img/techbanner12.png'}" alt="" />
+					th:src="${portalHost+'/img/tectbanner6.jpg'}" alt="" /> <img
+					th:src="${portalHost+'/img/tectbanner12.jpg'}" alt="" />
 			</a></li>
 		</ul>
 		<div class="btn_div">
@@ -123,7 +123,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="problem_bottom">我要咨询</div>
+			<div class="problem_bottom"><a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">我要咨询</a></div>
 		</div>
 	</div>
 	<div id="all_policy">
@@ -146,39 +146,47 @@
 				<p>土地、电力、排污、节能、科研资金、税收等各项扶持政策</p>
 			</div>
 			<div>
-				<img th:src="${portalHost+'/img/hightech6.jpg'}" alt="" />
+				<img th:src="${portalHost+'/img/hightech6.png'}" alt="" />
 				<p>政府帮企业背书,实现提高企业品牌知名度</p>
 			</div>
 		</div>
 	</div>
 	<div id="all_field">
 		<div class="field">
-			<h3>国家重点支持的高新技术领域</h3>
-			<div class="field_1">
-				<div>电子信息技术</div>
-			</div>
-			<div class="field_2">
-				<div>生物与新医药技术</div>
-			</div>
-			<div class="field_3">
-				<div>航空航天技术</div>
-			</div>
-			<div class="field_4">
-				<div>新材料技术</div>
-			</div>
-			<div class="field_5">
-				<div>高技术服务业</div>
-			</div>
-			<div class="field_6">
-				<div>新能源及节能技术</div>
-			</div>
-			<div class="field_7">
-				<div>资源与环境技术</div>
-			</div>
-			<div class="field_8">
-				<div>高新技术改造传统产业</div>
-			</div>
-		</div>
+	        <h3>国家重点支持的高新技术领域</h3>
+	        <div class="field_1">
+	        	<img th:src="${portalHost+'/img/hightech7.png'}" alt="" />
+	            <div>电子信息技术</div>
+	        </div>
+	        <div class="field_2">
+	        	<img th:src="${portalHost+'/img/hightech8.png'}" alt="" />
+	            <div>生物与新医药技术</div>
+	        </div>
+	        <div class="field_3">
+	        	<img th:src="${portalHost+'/img/hightech9.png'}" alt="" />
+	            <div>航空航天技术</div>
+	        </div>
+	        <div class="field_4">
+	        	<img th:src="${portalHost+'/img/hightech10.png'}" alt="" />
+	            <div>新材料技术</div>
+	        </div>
+	        <div class="field_5">
+	        	<img th:src="${portalHost+'/img/hightech11.png'}" alt="" />
+	            <div>高技术服务业</div>
+	         </div>
+	        <div class="field_6">
+	        	<img th:src="${portalHost+'/img/hightech12.png'}" alt="" />
+	            <div>新能源及节能技术</div>
+	        </div>
+	        <div class="field_7">
+	        	<img th:src="${portalHost+'/img/hightech13.png'}" alt="" />
+	            <div>资源与环境技术</div>
+	        </div>
+	        <div class="field_8">
+	        	<img th:src="${portalHost+'/img/hightech14.png'}" alt="" />
+	            <div>高新技术改造传统产业</div>
+	        </div>
+	    </div>
 	</div>
 	<div id="all_goodness">
 		<div class="goodness">

+ 31 - 17
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -6,6 +6,18 @@
 <title>知识产权</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service/propertyRight.css'}" rel="stylesheet">
+<script th:inline="javascript">
+	/* var isLogin = [[${isLogin}]];
+	if(isLogin){
+		跳转  globalConfig.context+'/user/account/services.html#contract'
+	}else{
+		$('#msg').val('请先登录')
+		$('.smg').fadeIn(300);
+		setTimeout(function(){
+    		$('.smg').fadeOut(500)
+    	},2000)
+	}	 */	
+</script>
 </head>
 <body>
 	<header>
@@ -31,28 +43,28 @@
 		<div class="carousesmall">
 			<ul class="ct_img_big clear">
 				<li data-index=0><a href=""> <img
-						th:src="${portalHost+'/img/tectbanner1.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner7.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner1.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner7.jpg'}" alt="" />
 				</a></li>
 				<li data-index=1><a href=""> <img
-						th:src="${portalHost+'/img/techbanner2.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner8.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner2.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner8.jpg'}" alt="" />
 				</a></li>
 				<li data-index=2><a href=""> <img
-						th:src="${portalHost+'/img/techbanner3.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner9.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner3.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner9.jpg'}" alt="" />
 				</a></li>
 				<li data-index=3><a href=""> <img
-						th:src="${portalHost+'/img/techbanner4.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner10.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner4.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner10.jpg'}" alt="" />
 				</a></li>
 				<li data-index=4><a href=""> <img
-						th:src="${portalHost+'/img/techbanner5.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner11.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner5.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner11.jpg'}" alt="" />
 				</a></li>
 				<li data-index=5><a href=""> <img
-						th:src="${portalHost+'/img/techbanner6.png'}" alt="" /> <img
-						th:src="${portalHost+'/img/techbanner12.png'}" alt="" />
+						th:src="${portalHost+'/img/tectbanner6.jpg'}" alt="" /> <img
+						th:src="${portalHost+'/img/tectbanner12.jpg'}" alt="" />
 				</a></li>
 			</ul>
 			<div class="btn_div">
@@ -80,14 +92,14 @@
   				<ul>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_090.jpg'}" alt="" />
-	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
+	  					<p>保护产品创新和方法创新。授权时间需1-2年,保护时间20年。</p>
 	  				</li>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_090.jpg'}" alt="" />
-	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
+	  					<p>保护产品结构形状微创新等。授权时间需3-6个月,保护时间10年。</p>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_090.jpg'}" alt="" />
-	  					<p>16年的专业科技咨询经验,拥有咨询业甲级资质,在全国拥有25家分(子)咨询机构。为各单位提供政策咨询、科技咨询、知识产权运营,企业上市服务等共22500项。</p>
+	  					<p>保护产品的外形和包装。授权时间3-6个月,保护时间10年。</p>
 	  				</li>
   				</ul>
   			</div>
@@ -96,7 +108,8 @@
   			</div>  			
   		</div> 
   		<div class="welfare_href">
-  			<a href="">立即申请</a><a href="">专利征集</a>
+  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即申请</a>
+  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">专利征集</a>
   		</div> 		
   	</div>
   	<div class="propery_star"></div>  		 	
@@ -130,7 +143,8 @@
   		</div>
   		<div class="intellectual_right">
   			<h4>知识产权贯标</h4>
-  			<p>度F官方擦不是电话ZNX科媒那是八十多阿红说电话但是阿红说的哈就啊啊啊就爱就爱睡觉卡刷卡卡下面先教会的工业就大呼千万蝴蝶花千万赌并无</p>
+  			<p>什么是知识产权贯标:企业按照GB/T29490-2013《企业知识产权管理规范》建立一套既适应经济和社会发展状况又符合企业自身发展需求的知识产权管理体系,
+  			并通过第三方机构的评审考察,获得荣誉证书,以提升自身知识产权管理水平,加快企业竞争升级。</p>
   		</div>  		
   	</div>
   	<div class="process">

+ 12 - 17
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -38,31 +38,26 @@
 						<span>
 							<img th:src="${portalHost+'/img/tech_ty.png'}" alt=""/>
 						</span>
-						<h3>高新是什么?</h3>
-						<p>高新技术是指那些对一个国家或一个地区的政治、
-							经济和军事等各方面的进步产生深远的影响,并能形成产业的先进技术群。
-						</p>
-						<a href="#">了解更多</a>
+						<h3>专业诊断保障!</h3>
+						<p>专家一对一服务,为客户科学诊项目,构建方案,详解政策,可帮助企业进行精准诊断,为企业尽可能增加申报成功率,尽可能达到一次通过。</p>
+						<a th:href="${portalHost+'/portal/service/highTechCognizance.html'}">了解更多</a>
 					</div>
 					<div>
 						<span>
 							<img th:src="${portalHost+'/img/tech_tr.png'}" alt=""/>
 						</span>
-						<h3>高新是什么?</h3>
-						<p>高新技术是指那些对一个国家或一个地区的政治、
-							经济和军事等各方面的进步产生深远的影响,并能形成产业的先进技术群。
-						</p>
-						<a href="#">了解更多</a>
+						<h3>专业能力保障!</h3>
+						<p>专业优秀的服务团队,提供高效率、高质量的服务,加上系统的资料整理流程和模块,有效保证了高成功率。</p>
+						<a th:href="${portalHost+'/portal/service/highTechCognizance.html'}">了解更多</a>
 					</div>
 					<div>
 						<span>
 							<img th:src="${portalHost+'/img/tech_th.png'}" alt=""/>
 						</span>
-						<h3>高新是什么?</h3>
-						<p>高新技术是指那些对一个国家或一个地区的政治、
-							经济和军事等各方面的进步产生深远的影响,并能形成产业的先进技术群。
+						<h3>专业跟踪服务!</h3>
+						<p>在规范的客户信息数据库基础上,对客户进行后期项目跟踪,进行后端信息资源对接,协助企业构建科技管理体系。
 						</p>
-						<a href="#">了解更多</a>
+						<a th:href="${portalHost+'/portal/service/highTechCognizance.html'}">了解更多</a>
 					</div>
 				</div>
 				<div class="serve_right">
@@ -125,7 +120,7 @@
   				</li>
   				<li>
   					<p>政府补助<span>10万</span></p>
-  					<a href="#">了解政策</a>
+  					<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">了解政策</a>
   				</li>  				
   			</ul>
   		</div>
@@ -266,11 +261,11 @@
   			<div class="technology_box">
   				<div class="technology_left">
   					<p>了解各地政策</p>
-  					<a href="">了解更多</a>
+  					<a th:href="${basePath+'/portal/thinkTank/policyList.html'}">了解更多</a>
   				</div>
   				<div class="technology_left">
   					<p>推荐机构</p>
-  					<a href="">了解更多</a>
+  					<a th:href="${basePath+'/portal/financial/investmentInstitution.html'}">了解更多</a>
   				</div>
   			</div>
   		</div>

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