Browse Source

Merge branch 'dev' of https://git.coding.net/aft/AFT.git into dev

Conflicts:
	src/main/webapp/WEB-INF/views/portal/index.html
wanghui 8 years ago
parent
commit
faf26bd6de

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

@@ -571,29 +571,4 @@ public class WebpageController extends BaseController {
 		}
 	}
 	
-	/**
-	 * 会员介绍
-	 * @param request
-	 * @param modelview
-	 * @param pageType (0:专利产品页,1:技术成果页面,2:技术需求页面)
-	 * @param keyWord
-	 *   
-	 * @return
-	 */
-	@RequestMapping(value="/portal/search/keyword" ,method = RequestMethod.GET)
-	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);
-	}
 }

+ 2 - 1
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -117,7 +117,8 @@ public class NewsController extends BaseController {
 		News newsDetail = newsService.findNewsDetail(id);
 		Object news = newsList.getList().get(0);
 		SimpleDateFormat fmt = new SimpleDateFormat();
-		newsDetail.setCreateTimeS(newsDetail==null?"":fmt.format(newsDetail.getCreateTime()));
+		if(null!=newsDetail)
+		newsDetail.setCreateTimeS(fmt.format(newsDetail.getCreateTime()));
 		@SuppressWarnings("unchecked")
 		List<NewsPortalList> la = (List<NewsPortalList>) newsList.getList();
 		for (NewsPortalList n : la) {

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

@@ -70,13 +70,23 @@
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+<<<<<<< HEAD
 				<h2>买专利,享九折,立即领取</h2>
+=======
+				<h2>专利申请,限时九折</h2><br/>
+				<h2>(前100个)</h2>
+>>>>>>> branch 'dev' of https://git.coding.net/aft/AFT.git
 				<p>有限期至:2017-10-1</p>
 				</a>						
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+<<<<<<< HEAD
 				<h2>百元做软著,限量领取</h2>
+=======
+				<h2>100元软著全包</h2><br/>
+				<h2>(限量100个)</h2>
+>>>>>>> branch 'dev' of https://git.coding.net/aft/AFT.git
 				<p>有限期至:2017-10-1</p>
 				</a>								
 			</div>

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

@@ -2,7 +2,7 @@
 <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>
+	<title>科技交易</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/technologyTrading/achievement.css'}" rel="stylesheet">
 </head>

+ 8 - 9
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -31,10 +31,15 @@
 			<div class="detail_center">
 				<div class="detail_centerimg" th:each="achievementdetail:${achievementdetail}">
 					<div>
-						<div th:if="${achievementdetail.technicalPictureUrl} == null " >
+						<div class="small_img">
+							<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+							<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+							<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+						</div>
+						<div th:if="${achievementdetail.technicalPictureUrl} == null " class="big_img">
 							<img th:src="${avatarUploadHost+ '/default/bigimg_null.png'}" alt=""/>
 						</div>
-						<div th:if="${achievementdetail.technicalPictureUrl} != null " >
+						<div th:if="${achievementdetail.technicalPictureUrl} != null " class=big_img>
 							<img th:src= "${avatarUploadHost+achievementdetail.technicalPictureUrl}"alt="" />
 						</div>
 					</div>
@@ -72,10 +77,6 @@
 				<div class="detail_centertext" th:each="achievementdetail:${achievementdetail}">
 					<div class="text_left">
 						<div>
-							<h5 class="left_p">拥有者:</h5>
-							<p th:text="${achievementdetail.ownerName}?${achievementdetail.ownerName}:未公开">未公开</p>
-						</div>
-						<div>
 							<h5 class="left_p">技术成熟度:</h5>
 							<p th:text="${achievementdetail.maturityS}?${achievementdetail.maturityS}:未知">未知</p>
 							
@@ -91,7 +92,7 @@
 					</div>
 					<div class="text_right">
 						<div>技术简介</div>
-						<p th:text="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
+						<p th:utext="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
 						
 					</div>
 				</div>
@@ -101,8 +102,6 @@
 				<div class="main_introduce" >
 					<ul>
 						<li th:each="reachievementlist:${reachievementlist}">
-						<!-- 	<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" /> -->
-							
 							<div th:if="${reachievementlist.technicalpictureurl} == null " >
 								<img th:src="${avatarUploadHost+ '/default/zhuanliimg_null.png'}" alt=""/>
 							</div>

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

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技需求</title>
+<title>科技交易</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demand.css'}" rel="stylesheet">
 </head>

+ 1 - 9
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -43,14 +43,6 @@
 							<h5>名称:</h5>
 							<p th:text="${demand.name}?${demand.name}:暂无名称"></p>
 						</div>
-						<div>
-							<h5>联系人:</h5>
-							<p th:text="${demand.employerName}?${demand.employerName}:未公开"></p>
-						</div>
-						<div>
-							<h5>联系人地址:</h5>
-							<p th:text="${demand.employerAddress}?${demand.employerAddress}:未公开"></p>
-						</div>
 						<div class="inline_span">
 							<span>行业:</span>  <span th:text="${demand.industryCategoryAS}?${demand.industryCategoryAS}:暂无行业分类"></span>
 						</div>
@@ -85,7 +77,7 @@
 				<div class="detail_centertext">
 					<div class="text_right" th:each="demand:${demand}">
 						<div>问题描述</div>
-						<p th:text="${demand.problemDes}?${demand.problemDes}:Sorry还没有相关描述"></p>
+						<p th:utext="${demand.problemDes}?${demand.problemDes}:Sorry还没有相关描述"></p>
 					</div>
 				</div>
 			</div>

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

@@ -42,105 +42,17 @@
 				<div>
 					<div class="clear_line"></div>
 					<div class="technolo_text">
-						<div>
+						<div val='ed430858-bea1-45d9-88c7-626ce0efb63b' typ='1'>
 							<h5>风机过滤装置的进风过滤网板</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-7-4</a>
+							<a href="javascript:;">2017-09-20</a>
 						</div>
-						<div>
+						<div val='bc85fb3f-8bd3-4625-b53a-db8dff1be9ee' typ='1'>
 							<h5>免全站仪的塔基断面图测量方法和设备</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-21</a>
+							<a href="javascript:;">2017-09-20</a>
 						</div>
-						<div>
+						<div val='498ff064-0033-42ff-8dc0-6888cdb59512' typ='1'>
 							<h5>冷焰火喷发设备的电子控制装置</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-2-24</a>
-						</div>
-						<div>
-							<h5>低碳高硅硅锰合金的生产方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-6</a>
-						</div>
-						<div>
-							<h5>低钛高碳铬铁生产工艺</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-6</a>
-						</div>
-						<div>
-							<h5>防卡篦条溜筛</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-10</a>
-						</div>
-						<div>
-							<h5>无破碎提升机料斗</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-28</a>
-						</div>
-						<div>
-							<h5>无破碎提升机</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-28</a>
-						</div>
-						<div>
-							<h5>垄沟种全覆膜播种机</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-3-24</a>
-						</div>
-						<div>
-							<h5>对测风数据进行补缺修正的方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-4-1</a>
-						</div>
-						<div>
-							<h5>电信级节能保护系统及其实现方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-4-1</a>
-						</div>
-						<div>
-							<h5>高纯高硬度聚晶立方氮化硼块体材料及其制备方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-4-1</a>
-						</div>
-						<div>
-							<h5>混凝土屋面与金属板屋面的可变形衔接方法及可变形衔接结构</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-4-12</a>
-						</div>
-						<div>
-							<h5>混凝土栈桥楼面的可变形衔接方法及衔接结构</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-4-12</a>
-						</div>
-						<div>
-							<h5>用于检测喹啉不溶物的砂芯坩埚的处理方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-5-7</a>
-						</div>
-						<div>
-							<h5>坐标测量方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-5-5</a>
-						</div>
-						<div>
-							<h5>无毒环保型防腐防水抗渗耐磨的补强材料及其制备方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-7-31</a>
-						</div>
-						<div>
-							<h5>提高解吸电解金泥过滤速度的方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-8-8</a>
-						</div>
-						<div>
-							<h5>立式板材激光刻纹机</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-5-6</a>
-						</div>
-						<div>
-							<h5>钨钛合金的深冷处理方法</h5>
-							<p>发明</p>
-							<a href="javascript:;">2017-7-1</a>
+							<a href="javascript:;">2017-09-20</a>
 						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_text.png'}" alt="" />