Browse Source

科技交易

wanghui 8 years ago
parent
commit
a5ff115829
22 changed files with 684 additions and 430 deletions
  1. 15 0
      schema/20170901-member_order.sql
  2. 2 0
      schema/20170911-achievement-intro-length.sql
  3. 0 6
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  4. 4 4
      src/main/java/com/goafanti/common/controller/WebpageController.java
  5. 1 1
      src/main/java/com/goafanti/common/dao/MemberGradeMapper.java
  6. 6 12
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  7. 5 5
      src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml
  8. 6 6
      src/main/java/com/goafanti/common/mapper/MyAppMapper.xml
  9. 3 1
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  10. 11 30
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
  11. 3 3
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java
  12. 6 7
      src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java
  13. 12 0
      src/main/java/com/goafanti/user/bo/UserPageHomeBo.java
  14. 17 84
      src/main/webapp/WEB-INF/views/common.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  16. 0 109
      src/main/webapp/WEB-INF/views/portal/search/achievement.html
  17. 0 106
      src/main/webapp/WEB-INF/views/portal/search/demand.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  19. 296 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  20. 289 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  21. 1 14
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  22. 5 40
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

+ 15 - 0
schema/20170901-member_order.sql

@@ -0,0 +1,15 @@
+CREATE TABLE `member_order` (
+  `id` bigint(19) NOT NULL,
+  `menber_type` int(11) NOT NULL COMMENT '付费会员类型',
+  `price` double(10,2) NOT NULL COMMENT '价格',
+  `valid_month` int(11) NOT NULL COMMENT '会员月类型',
+  `order_state` int(11) NOT NULL COMMENT '付款状态  0:未付款 1:已付款',
+  `order_time` datetime NOT NULL COMMENT '下单时间',
+  `user_id` varchar(36) NOT NULL COMMENT '用户ID 外键',
+  `payment_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `payment_value` double(10,2) DEFAULT NULL COMMENT '实际支付金额',
+  `payment_type` varchar(16) DEFAULT NULL COMMENT '支付方式',
+  `payment_id` varchar(45) DEFAULT NULL COMMENT '支付流水号',
+  `valid_time` datetime DEFAULT NULL COMMENT '有效时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+ 2 - 0
schema/20170911-achievement-intro-length.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `achievement` 
+CHANGE COLUMN `introduction` `introduction` LONGTEXT NULL DEFAULT NULL COMMENT '成果简介' ;

+ 0 - 6
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -609,12 +609,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 				return res;
 			}
 
-			if (bo.getIntroduction().length() > 298) {
-				res.getError().add(buildError(ErrorConstants.PARAM_SIZE_ERROR, "",
-						AchievementImportFields.INTRODUCTION.getDesc()));
-				return res;
-			}
-
 			if (bo.getKeyword().length() > 44) {
 				res.getError().add(
 						buildError(ErrorConstants.PARAM_SIZE_ERROR, "", AchievementImportFields.KEYWORD.getDesc()));

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

@@ -213,9 +213,9 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/search/achievement", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
 	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/achievement");
+		modelview.setViewName("/portal/technologyTrading/achievement");
 		return modelview;
 	}
 
@@ -225,9 +225,9 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/search/demand", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/technologyTrading/demand", method = RequestMethod.GET)
 	public ModelAndView portalSearchDemand(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/search/demand");
+		modelview.setViewName("/portal/technologyTrading/demand");
 		return modelview;
 	}
 

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

@@ -20,7 +20,7 @@ public interface MemberGradeMapper {
 	
 	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
 	
-	int countMemberOrder();
+	int countMemberOrder(String userId);
 	
 	int addBasicsMemberOrder(MemberOrder mo);
 	

+ 6 - 12
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -9,7 +9,7 @@
     <result column="keyword" jdbcType="VARCHAR" property="keyword" />
     <result column="category" jdbcType="INTEGER" property="category" />
     <result column="summary" jdbcType="VARCHAR" property="summary" />
-    <result column="introduction" jdbcType="VARCHAR" property="introduction" />
+    <result column="introduction" jdbcType="LONGVARCHAR" property="introduction" />
     <result column="technical_picture_url" jdbcType="VARCHAR" property="technicalPictureUrl" />
     <result column="field_a" jdbcType="INTEGER" property="fieldA" />
     <result column="field_b" jdbcType="INTEGER" property="fieldB" />
@@ -101,7 +101,7 @@
       country_name_zh,international_flag,jmrh_flag,boutique)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
-      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=VARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
+      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
       #{fieldA,jdbcType=INTEGER}, #{fieldB,jdbcType=INTEGER}, #{fieldC,jdbcType=INTEGER}, 
       #{maturity,jdbcType=INTEGER}, #{maturityPictureUrl,jdbcType=LONGVARCHAR}, #{maturityTextFileUrl,jdbcType=VARCHAR}, 
       #{maturityVideoUrl,jdbcType=VARCHAR}, #{innovation,jdbcType=INTEGER}, #{ownerId,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR},
@@ -313,7 +313,7 @@
         #{summary,jdbcType=VARCHAR},
       </if>
       <if test="introduction != null">
-        #{introduction,jdbcType=VARCHAR},
+        #{introduction,jdbcType=LONGVARCHAR},
       </if>
       <if test="technicalPictureUrl != null">
         #{technicalPictureUrl,jdbcType=VARCHAR},
@@ -483,7 +483,7 @@
         summary = #{summary,jdbcType=VARCHAR},
       </if>
       <if test="introduction != null">
-        introduction = #{introduction,jdbcType=VARCHAR},
+        introduction = #{introduction,jdbcType=LONGVARCHAR},
       </if>
       <if test="technicalPictureUrl != null">
         technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
@@ -640,7 +640,7 @@
       keyword = #{keyword,jdbcType=VARCHAR},
       category = #{category,jdbcType=INTEGER},
       summary = #{summary,jdbcType=VARCHAR},
-      introduction = #{introduction,jdbcType=VARCHAR},
+      introduction = #{introduction,jdbcType=LONGVARCHAR},
       technical_picture_url = #{technicalPictureUrl,jdbcType=VARCHAR},
       field_a = #{fieldA,jdbcType=INTEGER},
       field_b = #{fieldB,jdbcType=INTEGER},
@@ -1065,7 +1065,7 @@
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
-      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=VARCHAR}
+      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR}
       )
     </foreach>
   </insert>
@@ -1082,18 +1082,12 @@
   	from achievement a 
   	left join user u on u.id = a.owner_id
   	where a.deleted_sign = 0 
-  	and fieldA = #{fieldA,jdbcType=INTEGER} 
-  	and dataCategory = #{dataCategory,jdbcType=INTEGER}
-  	and category = #{category,jdbcType=INTEGER}
   	<if test="keyword != null">
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   	</if>
   	<if test="category != null">
   		and a.category = #{category,jdbcType=INTEGER}
   	</if>
-  	<if test="dataCategory != null">
-  		and a.dataCategory = #{dataCategory,jdbcType=INTEGER}
-  	</if>
   	<if test="bargainingMode != null">
   		and a.bargaining_mode = #{bargainingMode,jdbcType=INTEGER}
   	</if>

+ 5 - 5
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -61,10 +61,9 @@
 		resultMap="memberOrderMap">
 		SELECT mo.id,menber_type , mg.gradeName, price,
 		valid_month,order_state ,order_time ,user_id ,
-		payment_time
-		,payment_value,payment_type ,payment_id ,valid_time FROM member_order
-		mo
-		LEFT JOIN member_grade mg ON mg.id=mo.menber_Type
+		payment_time,payment_value,payment_type ,payment_id ,valid_time
+		FROM member_order mo
+		LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
 		WHERE user_id=#{id}
 		LIMIT #{pNos},#{pSize}
 	</select>
@@ -115,9 +114,10 @@
 		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
 	</insert>
 
-	<select id="countMemberOrder" resultType="int">
+	<select id="countMemberOrder" parameterType="String"  resultType="int">
 		SELECT COUNT(*) FROM
 		member_order
+		WHERE  user_id=#{userId}
 	</select>
 
 	<!-- 后台订单更改 -->

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

@@ -23,14 +23,14 @@
   </select>
   <select id="countMyTech" parameterType="String" resultType="org.springframework.ui.ModelMap">
   	select 
-	(select count(1) from achievement a left join achievement_demand ad on a.id=ad.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status>5 and (ao.service_money>0 or ao.commission>0 or ao.intention_money>0)) as `deal`,
-	(select count(1) from achievement a left join achievement_interest ai on a.id=ai.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(select count(1) from achievement a left join achievement_demand ad on a.id=ad.achievement_id where ad.demand_id is not null and a.owner_id=#{uid,jdbcType=VARCHAR}) as `match`,
+	(select count(1) from achievement a left join achievement_order ao on a.id=ao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and ao.status  <![CDATA[ > ]]>  5 and (ao.service_money  <![CDATA[ > ]]> 0 or ao.commission <![CDATA[ > ]]> 0 or ao.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+	(select count(1) from achievement a left join achievement_order iao on a.id=iao.achievement_id where a.owner_id=#{uid,jdbcType=VARCHAR} and iao.status  <![CDATA[ < ]]> 6) as `intention`
   </select>
   <select id="countMyDemand" parameterType="String" resultType="org.springframework.ui.ModelMap">
 	select 
-	(select count(1) from demand d left join achievement_demand ad on d.id=ad.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR}) as `match`,
-	(select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status>5 and (`do`.service_money>0 or `do`.commission>0 or `do`.intention_money>0)) as `deal`,
-	(select count(1) from demand d left join demand_interest di on d.id=di.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR}) as `intention`
+	(select count(1) from demand d left join achievement_demand ad on d.id=ad.demand_id where ad.demand_id is not null and d.employer_id=#{uid,jdbcType=VARCHAR}) as `match`,
+	(select count(1) from demand d left join demand_order `do` on d.id=`do`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `do`.status <![CDATA[ > ]]> 5 and (`do`.service_money <![CDATA[ > ]]> 0 or `do`.commission <![CDATA[ > ]]> 0 or `do`.intention_money <![CDATA[ > ]]> 0)) as `deal`,
+	(select count(1) from demand d left join demand_order `ido` on d.id=`ido`.demand_id where d.employer_id=#{uid,jdbcType=VARCHAR} and `ido`.status <![CDATA[ < ]]> 6) as `intention`
   </select>
 </mapper>

+ 3 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -24,6 +24,7 @@
     <result column="type" jdbcType="INTEGER" property="type"/>
     <result column="person_portrait_url" jdbcType="VARCHAR" property="personPortraitUrl"/>
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl"/>
+    <result column="gradeName" jdbcType="VARCHAR" property="gradeName"/>
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserDownLoadBo" id="UserDownLoadBo">
@@ -194,7 +195,7 @@
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
    select 
-   		u.lvl, u.nickname, u.email,
+   		u.lvl, mg.gradeName , u.nickname, u.email,
    		u.number, u.type, i.person_portrait_url, 
    		o.logo_url , u.id as uid, adc.achievement_count as achievementNum,
    		adc.demand_count as demandNum
@@ -202,6 +203,7 @@
    LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid 
    LEFT JOIN achievement_demand_count adc on adc.uid = u.id
+   LEFT JOIN   member_grade mg ON mg.memberRank=u.lvl
    where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   

+ 11 - 30
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -1,11 +1,7 @@
 package com.goafanti.memberGrade.controller;
 
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,9 +14,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.MemberOrder;
-import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
@@ -102,15 +100,8 @@ public class MemberGradeController extends BaseApiController {
 	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
 	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
 			Integer orderState, String startTime, String endTime) {
-		Integer pNo = 1;
-		Integer pSize = 10;
-		String da = null;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
+		Integer pNo=getPageNo(pageNo);
+		Integer pSize=getPageSize(pageSize);
 		Integer pNos = (pNo - 1) * pSize;
 		Map<String, Object> map = new HashMap<>();
 		map.put("pNos", pNos);
@@ -120,24 +111,17 @@ public class MemberGradeController extends BaseApiController {
 		map.put("nickname", nickname);
 		map.put("orderState", orderState);
 		map.put("startTimes", startTime);
-		if (endTime != null) {
-			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		if(endTime!=null){
 			try {
-				Date date = df.parse(endTime);
-				Calendar calendar = Calendar.getInstance();
-				calendar.setTime(date);
-				calendar.add(Calendar.DAY_OF_MONTH, 1);
-				da = df.format(calendar.getTime());
+				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
 			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				LoggerUtils.error(this.getClass(), "ffff", e);
 			}
 		}
-		map.put("endTimes", da);
 		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
 		int countWhere = memberGradeService.countMemberOrderWhere(map);
 		Map<String, Object> maps = new HashMap<>();
-		maps.put("List", list);
+		maps.put("list", list);
 		maps.put("countWhere", countWhere);
 		maps.put("pNo", pNo);
 		return res().data(maps);
@@ -155,7 +139,7 @@ public class MemberGradeController extends BaseApiController {
 	 * @param paymentType
 	 * @return
 	 */
-	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.GET)
+	@RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
 	public Result updateMemberOrder(Long id, int memberRank, Integer validMonth, Double paymentValue,
 			Integer orderState, String paymentTime, String paymentType,String userId) {
 		Map<String, Object> umap = new HashMap<>();
@@ -169,10 +153,7 @@ public class MemberGradeController extends BaseApiController {
 		map.put("orderState", orderState);
 		map.put("paymentTime", paymentTime);
 		map.put("paymentType", paymentType);
-		if( memberGradeService.updateUserLvl(umap)>=1 && memberGradeService.updateMemberOrder(map)>=1){
-			return res().data(1);
-		}
-		return res().data(0);
+		return res().data(memberGradeService.updateMemberOrder(map, umap));
 	}
 
 }

+ 3 - 3
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -53,10 +53,10 @@ public class MemberGradeFrontController extends BaseApiController {
 		map.put("pNos", pNos);
 		map.put("pSize", pSize);
 		map.put("id", TokenManager.getUserId());
-		List<MemberOrder> lsit = memberGradeService.selectMemberOrder(map);
-		int count = memberGradeService.countMemberOrder();
+		List<MemberOrder> list = memberGradeService.selectMemberOrder(map);
+		int count = memberGradeService.countMemberOrder(TokenManager.getUserId());
 		Map<String, Object> maps = new HashMap<>();
-		maps.put("lsit", lsit);
+		maps.put("list", list);
 		maps.put("count", count);
 		maps.put("pNo", pNo);
 		return res().data(maps);

+ 6 - 7
src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java

@@ -43,8 +43,8 @@ public class MemberGradeService {
 		return memberGradeMapper.selectMemberOrderBa(map);
 	}
 
-	public int countMemberOrder() {
-		return memberGradeMapper.countMemberOrder();
+	public int countMemberOrder(String userId) {
+		return memberGradeMapper.countMemberOrder(userId);
 	}
 
 	public int addBasicsMemberOrder(MemberOrder mo) {
@@ -56,14 +56,13 @@ public class MemberGradeService {
 	}
 	
 	
-	public int updateMemberOrder(Map<String, Object> map){
-		return memberGradeMapper.updateMemberOrder(map);
+	public int updateMemberOrder(Map<String, Object> map,Map<String, Object> umap){
+		int i=memberGradeMapper.updateMemberOrder(map);
+		int j=memberGradeMapper.updateUserLvl(umap);
+		return i+j;
 	}
 	
 	
-	public int updateUserLvl(Map<String, Object> map){
-		return memberGradeMapper.updateUserLvl(map);
-	}
 	
 	
 	

+ 12 - 0
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -67,6 +67,18 @@ public class UserPageHomeBo {
 	 */
 	private Integer	intellectualPropertyNum;
 
+	//会员名称
+	private String gradeName;
+	
+	public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
+
+	
 	public String getUid() {
 		return uid;
 	}

+ 17 - 84
src/main/webapp/WEB-INF/views/common.html

@@ -18,7 +18,7 @@
 </head>
 
 <body>
-	<th:block th:fragment="{nav}">
+	<th:block th:fragment="nav(mainM,subM)">
 		<div class="container">
   			<div class="logo">
   				<a th:href="${basePath + '/portal/index.html'}">
@@ -27,14 +27,24 @@
   			</div>
   			<div class="nav">
   				<ul>
-  					<li class="active">
+  					<li th:classappend="${mainM=='service'}? 'active'">
   						<a th:href="${basePath + '/portal/service/serviceIndex.html'}">科技服务</a>
-  						<img th:src="${portalHost+'/img/hot.png'}"/>
+  						<img th:src="${portalHost+'/img/hot.png'}"/>			
   					</li>
-  					<li>
+  					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
   						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
+  						<div class="subnavigation">
+  						<ol>
+  							<li>
+  								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">科技专利</a>
+  							</li>
+  							<li>
+  								<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">科技需求</a>
+  							</li>
+  						</ol>
+  						</div>
   					</li>
-  					<li>
+  					<li th:classappend="${mainM=='thinkTank'}? 'active'">
   						<a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
   					</li>
   					<li><a href="#">科技金融</a></li>
@@ -61,84 +71,6 @@
 	</a>
 	</th:block>
 
-	<th:block th:fragment="subMenu(mainM, subM)">
-		<ul class="nav_content">
-			<li class="home"><a th:href="${basePath + '/portal/index.html'}">首页</a></li>
-			<li th:classappend="${mainM=='tech'}? 'active'">
-				<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(4*75)+'px;left:-'+(4*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='demand'}? 'active'"><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
-					<li th:classappend="${subM=='tech'}? 'active'"><a th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='service'}? 'active'">
-				<a th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='highTech'}? 'active'"><a th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
-					<li th:classappend="${subM=='ipr'}? 'active'"><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
-					<li th:classappend="${subM=='evaluate'}? 'active'"><a th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='activityIndex'}? 'active'">
-				<a th:href="${basePath + '/portal/activity/activityIndex.html'}">活动圈</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(2*75)+'px;left:-'+(2*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='activityList'}? 'active'"><a th:href="${basePath + '/portal/activity/activityList.html?type=0'}">在线直播</a></li>
-					<li th:classappend="${subM=='activityList'}? 'active'"><a th:href="${basePath + '/portal/activity/activityList.html?type=1'}">线下现场</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='websiteBuildIndex'}? 'active'">
-				<a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html'}">建设兵团</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html#customized'}">平台定制</a></li>
-					<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html#operates'}">平台运营</a></li>
-					<li><a th:href="${basePath + '/portal/websiteBuild/websiteBuildIndex.html#event_planning'}">活动筹划</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='internationalIndex'}? 'active'">
-				<a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li><a th:href="${basePath + '/portal/international/internationalIndex.html#internationalTechnology'}">国际技术</a></li>
-					<li><a th:href="${basePath + '/portal/international/internationalIndex.html#internationalPartner'}">国际伙伴</a></li>
-					<li><a th:href="${basePath + '/portal/international/internationalIndex.html#internationalExpert'}">国际专家</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='bigShot'}? 'active'">
-				<a th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(2*75)+'px;left:-'+(2*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='star'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
-					<li th:classappend="${subM=='lecture'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
-					<!-- <li><a href="#">众筹专区</a></li> -->
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='news'}? 'active'">
-				<a th:href="${basePath + '/portal/news/newsIndex.html'}">策源地</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(4*75)+'px;left:-'+(4*75/2-74.25/2)+'px;'}">
-					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=1'}">新闻快讯</a></li>
-					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=3'}">技淘新闻</a></li>
-					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=4'}">科技政策</a></li>
-					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=2'}">政府往来</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='creative'}? 'active'">
-				<a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">创业圈</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">项目圈</a></li>
-					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html#chuangke'}">创客圈</a></li>
-					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html#jieyi'}">结义园</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='financial'}? 'active'">
-				<a th:href="${basePath + '/portal/financial/financialIndex.html'}">金融圈</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(1*75)+'px;left:-'+(1*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='financial'}? 'active'"><a th:href="${basePath + '/portal/financial/financialIndex.html'}">金融街</a></li>
-				</ul>
-			</li>
-			<li th:classappend="${mainM=='residentIntegration'}? 'active'">
-				<a th:href="${basePath + '/portal/residentIntegration/index.html'}">军民融合</a>
-			</li>
-		</ul>
-	</th:block>
-
 	<th:block th:fragment="banners">
 		<div id="myCarousel" class="carousel slide" th:if="${banners!=null && banners.size() > 1}">
 			<ol class="carousel-indicators">
@@ -258,7 +190,7 @@
 						</div>
 						<div class="login_pass">
 							<label for="pass"><img th:src="${portalHost+'/img/login_password.png'}" /></label>
-							<input type="text" name="password" id="Lo_pass" placeholder="请输入密码" />
+							<input type="password" name="password" id="Lo_pass" placeholder="请输入密码" />
 						</div>
 						<div class="login_check">
 							 <label for="checks" class="lab_check"> 
@@ -283,6 +215,7 @@
 			/*<![CDATA[*/
 			window.globalConfig = {};
 			globalConfig.context = /*[[${basePath}]]*/ '';
+			globalConfig.portalHost = /*[[${portalHost}]]*/ '';
 			globalConfig.staticDomain = /*[[${staticDomain}]]*/ '';
 			globalConfig.staticHost = /*[[${staticHost}]]*/ '';
 			globalConfig.uploadPath = /*[[${uploadPath}]]*/ '';

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

@@ -9,7 +9,7 @@
 </head>
 <body>  	
   	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('','')"></div>
 	</header>
 	<div class="banner_all container">
 		<div class="carousel_top">

+ 0 - 109
src/main/webapp/WEB-INF/views/portal/search/achievement.html

@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>科技成果搜索页面</title>
-	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/search/achievement.css'}" rel="stylesheet">
-</head>
-<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="header_nav_detail">
-		<div class="container ">
-			<div class="row clearfix">
-				<div class="col-md-3 logo">
-					<div th:replace="common::sublogo"></div>
-				</div>
-				<div class="col-md-9">
-					<div th:replace="common::subMenu('tech', 'tech')"></div>
-				</div>
-			</div>
-		</div>
-		<div class="secondary_navigation"></div>
-	</div>
-	<div class="wrap active">
-    <div class="portal-body">
-      <div class="portal-content">
-        <div class="search-criteria row">
-          <div class="search-title col-md-1"> <span>行业分类</span> </div>
-          <div class="search-select col-md-11">
-            <ul id="industryList" class="clearfix"></ul>
-          </div>
-        </div>
-        <div class="search-criteria row" id="industryChildrenBox">
-          <div class="search-title col-md-1"> <span>行业子分类</span> </div>
-          <div class="search-select col-md-11">
-            <ul id="industryChildrenList" class="clearfix">
-              <li value="999" class="active"><span>不限</span></li>
-            </ul>
-          </div>
-        </div>
-        <div class="search-criteria row">
-          <div class="search-title col-md-1"> <span>交易方式</span> </div>
-          <div class="search-select col-md-6">
-            <ul id="transferModeList" class="clearfix">
-              <li value="999" class="active"><span>不限</span></li>
-              <li value="0"><span>完全转让</span></li>
-              <li value="1"><span>许可转让</span></li>
-              <li value="2"><span>技术入股</span></li>
-              <li value="3"><span>5年独占许可转让</span></li>
-            </ul>
-          </div>
-          <div class="col-md-5">
-            <div class="nav-search"> <input id="searchInput" placeholder="请输入关键词" /> <button id="search" class="search_ico"></button> </div>
-          </div>
-        </div>
-        <ul class='detail_interest_sub clearfix' id="achievementList">
-          <li>
-            <div class="interest_list_title">
-              <i class="demand_sup"></i>
-              <p title='跨媒体计算理论与方法'>跨媒体计算理论与方法</p>
-            </div>
-            <div class="interest_list_name">
-             <i class="demand_sup"></i>
-              <p>浙江大学</p>
-              <div class="interest_list_confirm"> <span>身份已验证</span> <i class="certify"></i> </div>
-            </div>
-            <div class="detail_sub"> <span class="detail_sub_icon"> 								<i class="demand_ico_5"></i> 							</span> <span class="detail_sub_title">关键词: </span>              <span class="detail_sub_text">跨媒体,计算理论,方法</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_2"></i>							</span> <span class="detail_sub_title">技术类型: </span>              <span class="detail_sub_text">项目</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">                            	<i class="demand_ico_1"></i>                            </span>              <span class="detail_sub_title">行业分类: </span> <span class="detail_sub_text">电子信息/其他电子信息</span> </div>
-            <div class="detail_sub">
-            <span class="detail_sub_icon">								<i class="demand_ico_3"></i>							</span> <span class="detail_sub_title">标价: </span>              <span class="money_text">价格面议</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="achievement_ico_1"></i>							</span> <span class="detail_sub_title">交易方式: </span>              <span class="money_text">完全转让</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="achievement_ico_2"></i>							</span> <span class="detail_sub_title">技术成熟度: </span>              <span class="detail_sub_score">								<span><i class="score_ioc" ></i></span> </span>
-            </div>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div class="container pagination_box">
-    <nav aria-label="Page navigation" class="clearfix">
-      <ul class="pagination">
-        <li class="pagePre"> <a href="#" aria-label="Previous">						<span aria-hidden="true">&laquo;</span>					</a> </li>
-        <li class="pageNumber active"><a href="#" value="1">1</a></li>
-        <li class="pageNext"> <a href="#" aria-label="Next">						<span aria-hidden="true">&raquo;</span>					</a> </li>
-      </ul> <span class="totalCount">共0条数据</span> </nav>
-  </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 + '/search/achievement.js'}"></script>
-	</div>
-</body>
-</html>

+ 0 - 106
src/main/webapp/WEB-INF/views/portal/search/demand.html

@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>科技需求搜索页面</title>
-	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/search/demand.css'}" rel="stylesheet">
-</head>
-<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="header_nav_detail">
-		<div class="container ">
-			<div class="row clearfix">
-				<div class="col-md-3 logo">
-					<div th:replace="common::sublogo"></div>
-				</div>
-				<div class="col-md-9">
-					<div th:replace="common::subMenu('tech', 'demand')"></div>
-				</div>
-			</div>
-		</div>
-		<div class="secondary_navigation"></div>
-	</div>
-	<div class="wrap active">
-    <div class="portal-body">
-      <div class="portal-content">
-        <div class="search-criteria row">
-          <div class="search-title col-md-1"> <span>行业分类</span> </div>
-          <div class="search-select col-md-11">
-            <ul id="industryList" class="clearfix"></ul>
-          </div>
-        </div>
-        <div class="search-criteria row" id="industryChildrenBox">
-          <div class="search-title col-md-1"> <span>行业子分类</span> </div>
-          <div class="search-select col-md-11">
-            <ul id="industryChildrenList" class="clearfix">
-              <li value="999" class="active"><span>不限</span></li>
-            </ul>
-          </div>
-        </div>
-        <div class="search-criteria row">
-          <div class="search-title col-md-1"> <span>技术类型</span> </div>
-          <div class="search-select col-md-8">
-            <ul id="technologyModeList" class="clearfix">
-              <li value="999" class="active"><span>不限</span></li>
-              <li value="0"><span>技术购买型需求</span></li>
-              <li value="1"><span>技术设备类需求</span></li>
-              <li value="2"><span>技术方案型需求</span></li>
-              <li value="3"><span>技术攻关型需求</span></li>
-              <li value="4"><span>技术咨询型需求</span></li>
-              <li value="5"><span>技术人才型需求</span></li>
-            </ul>
-          </div>
-          <div class="col-md-3">
-            <div class="nav-search"> <input id="searchInput" placeholder="请输入关键词" /> <button id="search" class="search_ico"></button> </div>
-          </div>
-        </div>
-        <ul class='detail_interest_sub clearfix' id="demandList">
-          <li>
-            <div class="interest_list_title"> <i class="demand_sup"></i>
-              <p title="视频压缩、传输与移动支付技术">视频压缩、传输与移动支付技术</p>
-            </div>
-            <div class="interest_list_name">
-              <p>融达天下软件技术南通有限公司</p>
-              <div class="interest_list_confirm"> <span>身份未验证</span> <i class="uncertify}"></i> </div>
-            </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_5"></i>                            </span> <span class="detail_sub_title">关键词: </span>              <span class="detail_sub_text">计算机,信息技术,互联网</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_2"></i>							</span> <span class="detail_sub_title">需求描述: </span>              <span title="描述信息" class="detail_sub_demandDes">描述信息</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_3"></i>							</span> <span class="detail_sub_title">预算: </span>              <span class="money_text">价格面议</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_4"></i>							</span> <span class="detail_sub_title">类型: </span>              <span class="detail_sub_text">技术咨询型需求</span> </div>
-            <div class="detail_sub"> <span class="detail_sub_icon">								<i class="demand_ico_1"></i>							</span> <span class="detail_sub_title">行业: </span>              <span class="detail_sub_text">电子信息/软件</span> </div>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div class="container pagination_box">
-    <nav aria-label="Page navigation" class="clearfix">
-      <ul class="pagination">
-        <li class="pagePre"> <a href="#" aria-label="Previous">						<span aria-hidden="true">&laquo;</span>					</a> </li>
-        <li class="pageNumber active"><a href="#" value="1">1</a></li>
-        <li class="pageNext"> <a href="#" aria-label="Next">						<span aria-hidden="true">&raquo;</span>					</a> </li>
-      </ul> <span class="totalCount">共0条数据</span> </nav>
-  </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 + '/search/demand.js'}"></script>
-	</div>
-</body>
-</html>

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

@@ -10,7 +10,7 @@
 
 <body>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('service','')"></div>
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">

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

@@ -0,0 +1,296 @@
+<!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 + '/technologyTrading/achievement.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('technologyTrading','achievement')"></div>
+	</header>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=3 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:href="${portalHost + '/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	
+	<!--主体内容区域开始-->
+  	<div class="contant">
+  		<div class="achievement_top"><img th:href="${portalHost + '/img/achievement_01.png'}" alt=""/></div>  		
+  	</div>
+  	<div class="container">
+  		<div class="achievement_header">
+  			<p>全部结果: </p>
+  			<ul>
+  				<li>  					
+  					<p>教育休闲1111</p>
+  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  				</li>
+  				<li>  					
+  					<p>教育休闲111</p>
+  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  				</li>
+  			</ul>
+  		</div>
+  		<div class="wrap active">
+			<div class="portal-body">
+				<div class="portal-content">
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>行业分类</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="industryList" class="clearfix"></ul>
+						</div>
+					</div>
+					<div class="search-criteria row" id="industryChildrenBox">
+						<div class="search-title col-md-1">
+							<span>技术类型</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul>
+								<li class="active"><span>不限</span></li>
+								<li>
+									<label for="patent" class="patent">
+										专利<input type="checkbox" name="fot" id="patent" value="0" />
+									</label>
+								</li>
+								<li>
+									<label for="demand" class="demand">
+										技术<input type="checkbox" name="fot" id="demand" value="1" />
+									</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>交易方式</span>
+						</div>
+						<div class="search-select col-md-6">
+							<ul id="transferModeList" class="clearfix">
+								<li value="999" class="active"><span>不限</span></li>
+								<li value="0"><span>完全转让</span></li>
+								<li value="1"><span>许可转让</span></li>
+								<li value="2"><span>技术入股</span></li>
+								<li value="3"><span>5年独占许可转让</span></li>
+							</ul>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="achievement_main">
+		<div class="container">
+			<div class="main-header">
+				<div class="head-left">
+					<p>排序方式</p>
+					<ul>							
+						<li class="active">不限</li>
+						<li>
+							<p><span>发布时间</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<div class="time_select">
+								<ul>
+									<li>09-12</li>
+									<li>03-08</li>
+									<li>02-03</li>
+								</ul>
+							</div>
+						</li>
+						<li>
+							<p><span>价格</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<div class="time_select">
+								<ul>
+									<li>10万以上</li>
+									<li>5万-10万</li>
+									<li>1万-5万</li>
+									<li>1万以下</li>
+								</ul>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<div class="head_right">
+					<div class="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<form action="" method="post" id="search_on">					
+		 					<input type="search" placeholder="医药生物"/>
+		 				</form>
+		 				<button form="search_on"></button>				
+		 			</div>
+		 			<ol>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 			</ol>
+				</div>
+			</div>
+			<div class="main_introduce">
+				<ul>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>	 							
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>	 							
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>	 							
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							
+	 						</ol>
+	 					</div>
+					</li>
+					
+				</ul>
+			</div>
+			<div class="container pagination_box">
+				<nav aria-label="Page navigation" class="clearfix">
+					<ul class="pagination">
+						<li class="pagePre">
+							<a href="#" aria-label="Previous">
+								<span aria-hidden="true">&laquo;</span>
+							</a>
+						</li>
+						<li class="pageNumber"><a href="#" value="1">1</a></li>
+						<li class="pageNext">
+							<a href="#" aria-label="Next">
+								<span aria-hidden="true">&raquo;</span>
+							</a>
+						</li>
+					</ul>
+					<span class="totalCount">共0条数据</span>
+				</nav>
+			</div>
+		</div>
+	</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 + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/technologyTrading/achievement.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -0,0 +1,289 @@
+<!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 + '/technologyTrading/demand.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+			<div th:replace="common::nav('technologyTrading','demand')"></div>
+	</header>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=3 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:href="${portalHost + '/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+  	<div class="contant">
+  		<div class="achievement_top"><img th:href="${portalHost + '/img/demand_01.png'}" alt=""/></div>  		
+  	</div>
+  	<div class="container">
+  		<div class="achievement_header">
+  			<p>全部结果: </p>
+  			<ul>
+  				<li>  					
+  					<p>教育休闲1111</p>
+  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  				</li>
+  				<li>  					
+  					<p>教育休闲111</p>
+  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  				</li>
+  				<li>  					
+  					<p>教育休闲111</p>
+  					<img th:href="${portalHost + '/img/achievement_del.jpg'}"/>
+  				</li>
+  			</ul>
+  		</div>
+  		<div class="wrap active">
+			<div class="portal-body">
+				<div class="portal-content">
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>行业分类</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="industryList" class="clearfix"></ul>
+						</div>
+					</div>
+					<div class="search-criteria row" id="industryChildrenBox">
+						<div class="search-title col-md-1">
+							<span>技术类型</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul>
+								<li class="active"><span>不限</span></li>
+								<li>
+									<label for="patent" class="patent">
+										专利<input type="checkbox" name="fot" id="patent" value="0" />
+									</label>
+								</li>
+								<li>
+									<label for="demand" class="demand">
+										技术<input type="checkbox" name="fot" id="demand" value="1" />
+									</label>
+								</li>
+							</ul>
+						</div>
+					</div>					
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="achievement_main">
+		<div class="container">
+			<div class="main-header">
+				<div class="head-left">
+					<p>排序方式</p>
+					<ul>							
+						<li class="active">不限</li>
+						<li>
+							<p><span>发布时间</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<div class="time_select">
+								<ul>
+									<li>09-12</li>
+									<li>03-08</li>
+									<li>02-03</li>
+								</ul>
+							</div>
+						</li>
+						<li>
+							<p><span>价格</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<div class="time_select">
+								<ul>
+									<li>10万以上</li>
+									<li>5万-10万</li>
+									<li>1万-5万</li>
+									<li>1万以下</li>
+								</ul>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<div class="head_right">
+					<div class="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<form action="" method="post" id="search_on">					
+		 					<input type="search" placeholder="医药生物"/>
+		 				</form>
+		 				<button form="search_on"></button>				
+		 			</div>
+		 			<ol>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 				<li>医药生物</li>
+		 			</ol>
+				</div>
+			</div>
+			<div class="main_introduce">
+				<ul>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+				</ul>
+			</div>
+			<div class="container pagination_box">
+				<nav aria-label="Page navigation" class="clearfix">
+					<ul class="pagination">
+						<li class="pagePre">
+							<a href="#" aria-label="Previous">
+								<span aria-hidden="true">&laquo;</span>
+							</a>
+						</li>
+						<li class="pageNumber"><a href="#" value="1">1</a></li>
+						<li class="pageNext">
+							<a href="#" aria-label="Next">
+								<span aria-hidden="true">&raquo;</span>
+							</a>
+						</li>
+					</ul>
+					<span class="totalCount">共0条数据</span>
+				</nav>
+			</div>
+		</div>
+	</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:href="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:href="${portalHost + '/technologyTrading/demand.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -9,21 +9,8 @@
 
 <body>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('technologyTrading','')"></div>
 	</header>
-	<!-- <div class="header_nav_detail">
-		<div class="container ">
-			<div class="row clearfix">
-				<div class="col-md-3 logo">
-					<div th:replace="common::sublogo"></div>
-				</div>
-				<div class="col-md-9">
-					<div th:replace="common::subMenu('tech', '')"></div>
-				</div>
-			</div>
-		</div>
-		<div class="secondary_navigation"></div>
-	</div> -->
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">

+ 5 - 40
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -4,12 +4,12 @@
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>智库咨询</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/thinktank.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
 </head>
 
 <body>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('thinkTank','')"></div>
 	</header>
 	<!--banner-->
   	<div class="carouselt">
@@ -79,49 +79,14 @@
 				<div class="portal-body">
 					<div class="portal-content">
 						<div class="search-criteria row">
-							<div class="search-title col-md-2">
+							<div class="search-title col-md-1">
 								<span>行业分类</span>
 							</div>
-							<div class="search-select col-md-10">
+							<div class="search-select col-md-11">
 								<ul id="industryList" class="clearfix"></ul>
 							</div>
 						</div>
 						<ul class='detail_interest_sub clearfix' id="subscriberList">
-							<li class="org-detail clearfix">
-								<div class="logo">
-									<i class="user_portrait_img"></i>
-								</div>
-								<div class="detail-right">
-									<div class="name">
-										<span>柏连阳</span>
-									</div>
-									<div class="text">
-										<span>省医学会检验专业委员会</span>
-									</div>
-									<div class="text">
-										<span>省医学会检验专业委员会副主任委员</span>
-									</div>
-									<div class="text">
-										<span title="生物与新医药/医疗仪器、设备与医学专用软件/医学影像诊断技术">生物与新医药/医疗仪器、设备与医学专用软件/医学影像诊断技术</span>
-									</div>
-									<div class="detail-text">
-										<div class="text">
-											<span class="letter_Spacing">需</span> <span>求: </span> <span
-												class="text-Number">123</span> <span class="text-unit">
-												条</span>
-										</div>
-										<div class="text">
-											<span>技术成果: </span> <span class="text-Number">456 </span> <span
-												class="text-unit"> 条</span>
-										</div>
-										<div class="text">
-											<span class="letter_Spacing">粉</span> <span>丝: </span> <span
-												class="text-Number">789</span> <span class="text-unit">
-												位</span>
-										</div>
-									</div>
-								</div>
-							</li>
 						</ul>
 					</div>
 				</div>
@@ -186,7 +151,7 @@
 	</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.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/thinkTank.js'}"></script>
 	</div>
 </body>
 </html>