Browse Source

Merge remote-tracking branch 'origin/test' into prod

wanghui 8 years ago
parent
commit
8f82b4c4c1
29 changed files with 827 additions and 578 deletions
  1. 2 1
      schema/data/html_fragment.sql
  2. 2 2
      src/main/java/com/goafanti/achievement/bo/AchievementOrderListBo.java
  3. 26 4
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 10 6
      src/main/java/com/goafanti/common/dao/MemberOrderMapper.java
  5. 4 0
      src/main/java/com/goafanti/common/enums/OrderState.java
  6. 8 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  7. 175 0
      src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml
  8. 9 0
      src/main/java/com/goafanti/common/mapper/MemberOrderMapperExt.xml
  9. 3 2
      src/main/java/com/goafanti/common/mapper/MyAppMapper.xml
  10. 60 52
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  11. 32 17
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
  12. 1 1
      src/main/java/com/goafanti/memberGrade/service/MemberGradeService.java
  13. 31 0
      src/main/java/com/goafanti/memberGrade/service/MemberOrderService.java
  14. 139 140
      src/main/java/com/goafanti/news/controller/NewsController.java
  15. 5 2
      src/main/webapp/WEB-INF/views/common.html
  16. 5 8
      src/main/webapp/WEB-INF/views/portal/financial/index.html
  17. 36 28
      src/main/webapp/WEB-INF/views/portal/index.html
  18. 39 35
      src/main/webapp/WEB-INF/views/portal/member.html
  19. 2 5
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  20. 51 43
      src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html
  21. 31 17
      src/main/webapp/WEB-INF/views/portal/service/propertyRight.html
  22. 12 17
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  23. 9 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  24. 6 12
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  25. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  26. 7 2
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  27. 111 105
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  28. 4 4
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  29. 6 71
      src/main/webapp/WEB-INF/views/user/subscriberDetail.html

File diff suppressed because it is too large
+ 2 - 1
schema/data/html_fragment.sql


+ 2 - 2
src/main/java/com/goafanti/achievement/bo/AchievementOrderListBo.java

@@ -161,7 +161,7 @@ public class AchievementOrderListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -205,7 +205,7 @@ public class AchievementOrderListBo {
 		if (this.paymentTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPaymentTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getPaymentTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 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.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);
+	}
 }

+ 10 - 6
src/main/java/com/goafanti/common/dao/MemberOrderMapper.java

@@ -1,17 +1,21 @@
 package com.goafanti.common.dao;
 
+import java.util.Map;
+
 import com.goafanti.common.model.MemberOrder;
 
 public interface MemberOrderMapper {
-    int deleteByPrimaryKey(Long id);
+	int deleteByPrimaryKey(Long id);
+
+	int insert(MemberOrder record);
 
-    int insert(MemberOrder record);
+	int insertSelective(MemberOrder record);
 
-    int insertSelective(MemberOrder record);
+	MemberOrder selectByPrimaryKey(Long id);
 
-    MemberOrder selectByPrimaryKey(Long id);
+	int updateByPrimaryKeySelective(MemberOrder record);
 
-    int updateByPrimaryKeySelective(MemberOrder record);
+	int updateByPrimaryKey(MemberOrder record);
 
-    int updateByPrimaryKey(MemberOrder record);
+	int updateUserLvl(Map<String, Object> params);
 }

+ 4 - 0
src/main/java/com/goafanti/common/enums/OrderState.java

@@ -21,6 +21,10 @@ public enum OrderState {
 		}
 	}
 
+	public static boolean isPayed(OrderState os) {
+		return os == PAYED || os == COMPLETED;
+	}
+
 	public static OrderState getStatus(Integer code) {
 		if (containsType(code)) {
 			return status.get(code);

+ 8 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1462,7 +1462,10 @@
 	on 
 		a.field_a = b.id 	
 	where 
-		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{fieldA,jdbcType=INTEGER}
+		a.boutique = 1  and a.audit_status = 3 
+	<if test="dataCategory != null and dataCategory != ''">
+		and a.field_a = #{fieldA,jdbcType=INTEGER}
+	</if>
 	<if test="dataCategory != null and dataCategory != ''">
 		and data_category = #{dataCategory,jdbcType=INTEGER}
 	</if>
@@ -1484,7 +1487,10 @@
 	on 
 		a.field_a = b.id 
 	where 
-		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{fieldA,jdbcType=INTEGER}
+		a.boutique = 1  and a.audit_status = 3 
+	<if test="dataCategory != null and dataCategory != ''">
+		and a.field_a = #{fieldA,jdbcType=INTEGER}
+	</if>
 	<if test="dataCategory != null and dataCategory != ''">
 		and data_category = #{dataCategory,jdbcType=INTEGER}
 	</if>

+ 175 - 0
src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.AchievementOrderMapper" >
+  <select id="selectAchievementOrderByUidAndAchievementId" resultMap="BaseResultMap" >
+  	select 
+    <include refid="Base_Column_List" />
+    from achievement_order
+   where 
+   	uid = #{0} and achievement_id = #{1} and deleted_sign = 0
+  </select>
+  
+   <select id="findAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   ao.uid = #{uid,jdbcType=VARCHAR}
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign 
+  	and   ao.uid = #{uid,jdbcType=VARCHAR}
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  </select>
+  
+  <select id="selectAchievementOrderByAchievementId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from achievement_order
+    where achievement_id = #{achievementId,jdbcType=VARCHAR}
+  </select>
+  
+  
+   <select id="findUserAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.UserAchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
+  		ao.uid, oi.unit_name as unitName, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 0
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="username != null">
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findUserAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 0
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="username != null">
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
+  	</if>
+  </select>
+  
+  
+  <select id="findOrgAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.OrgAchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime,  a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
+  		oi.unit_name as unitName, ui.username, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 1
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="unitName != null">
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findOrgAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 1
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="unitName != null">
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
+  	</if>
+  </select>
+</mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/MemberOrderMapperExt.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.MemberOrderMapper">
+	<!-- 更改用户会员等级 -->
+	<update id="updateUserLvl" parameterType="java.util.Map">
+		UPDATE user SET
+		lvl=#{lvl} WHERE id=#{userId}
+	</update>
+</mapper>

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

@@ -19,13 +19,14 @@
     (SELECT count(1) FROM activity_user where uid=#{uid,jdbcType=VARCHAR}) as activity,
     (SELECT count(1) FROM achievement_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as achievement,
     (SELECT count(1) FROM demand_order where uid=#{uid,jdbcType=VARCHAR} and deleted_sign=0) as demand,
+    (SELECT count(1) FROM consult_order where user_id=#{uid,jdbcType=VARCHAR} and order_state &lt; 9) as `date`,
     (SELECT count(1) FROM copyright_info where uid=#{uid,jdbcType=VARCHAR} and delete_sign=0) as copyright
   </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 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 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  &gt; 0 and ao.status &lt; 9) 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 = 0) as `intention`
   </select>
   <select id="countMyDemand" parameterType="String" resultType="org.springframework.ui.ModelMap">
     select 

+ 60 - 52
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -13,6 +13,7 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="mid" jdbcType="VARCHAR" property="mid" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserPageHomeBo" id="UserPageHomeBo">
@@ -755,57 +756,46 @@
     </if>
   </select>  
   
-  <select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
-  	SELECT
-  		u.number,
-        ui.username,
-        ui.province,
-        ui.city,
-        ui.area,
-        uc.engaged_field AS engagedField,
-        info.personal_profile AS personalProfile,
-        u.lvl AS LEVEL,
-        ua.ability_label AS abilityLabel,
-        info.person_portrait_url AS personPortraitUrl,
-        info.life_photo_url AS lifePhotoUrl,
-        interest.id as interestId
-    FROM
-    `user` u
-    LEFT JOIN user_identity ui ON ui.uid = u.id
-    LEFT JOIN user_career uc ON uc.uid = u.id
-    LEFT JOIN user_ability ua ON ua.uid = u.id
-    LEFT JOIN user_info info ON info.uid = u.id
-    LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
-    WHERE
-        u.type = 0
-    and u.id = #{uid,jdbcType=VARCHAR}
-  </select>
-  
-  <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
-  	SELECT
-  		u.number,
-        oi.unit_name AS unitName,
-        oi.licence_province AS province,
-        oi.licence_city AS city,
-        oi.licence_area AS area,
-        u.lvl AS LEVEL,
-        ua.ability_label AS abilityLabel,
-        info.logo_url AS logoUrl,
-        info.company_introduction AS companyIntroduction,
-        info.publicity_picture_url AS publicityPictureUrl,
-        ot.search_area_category as field, 
-        interest.id as interestId
-    FROM
-    `user` u
-    LEFT JOIN organization_identity oi ON oi.uid = u.id
-    LEFT JOIN organization_info info ON info.uid = u.id
-    LEFT JOIN organization_tech ot ON ot.uid = u.id
-    LEFT JOIN user_ability ua ON ua.uid = u.id
-    LEFT JOIN user_interest interest on interest.to_uid = u.id and interest.from_uid = #{tokenId,jdbcType=VARCHAR}
-    WHERE
-        u.type = 1
-    and u.id = #{uid,jdbcType=VARCHAR} 
-  </select>
+ 	<select id="findUserPartnerDetail" parameterType="java.lang.String"
+		resultType="com.goafanti.user.bo.UserPartnerDetailBo">
+		select
+		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
+		info.person_portrait_url as personPortraitUrl,
+		i.province,
+		info.personal_profile as personalProfile,
+		ua.ability_label as abilityLabel
+		from `user` u
+		left join user_identity i on u.id=i.uid
+		left join
+		user_career c on u.id=c.uid
+		left join user_info info on u.id=info.uid
+		left join user_ability ua on u.id=ua.uid
+		WHERE
+		u.type = 0
+		<if test="_parameter!= null">
+			and u.id= #{_parameter,jdbcType=VARCHAR}
+		</if>
+	</select>
+  
+  <select id="findOrgPartnerDetail" parameterType="java.lang.String"
+		resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
+		select
+		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
+		info.person_portrait_url as personPortraitUrl,
+		i.province,info.personal_profile as personalProfile,
+		ua.ability_label as abilityLabel
+		from `user` u
+		left join user_identity i on u.id=i.uid
+		left join
+		user_career c on u.id=c.uid
+		left join user_info info on u.id=info.uid
+		left join user_ability ua on u.id=ua.uid
+		WHERE
+		u.type = 1
+		<if test="_parameter!= null">
+			and u.id= #{_parameter,jdbcType=VARCHAR}
+		</if>
+	</select>
   
   <select id="findStarListByPage" parameterType="String" resultType="com.goafanti.user.bo.StarListBo">
   	select 
@@ -935,5 +925,23 @@
   	select number
   	from user
   	where id = #{id,jdbcType=VARCHAR}
-  </select>
+  </select>
+  
+  <select id="findUserPartner" parameterType="String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
+		select
+		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
+		info.person_portrait_url as personPortraitUrl,
+		i.province,
+		info.personal_profile as personalProfile,
+		ua.ability_label as abilityLabel
+		from `user` u
+		left join user_identity i on u.id=i.uid
+		left join
+		user_career c on u.id=c.uid
+		left join user_info info on u.id=info.uid
+		left join user_ability ua on u.id=ua.uid
+		WHERE
+		u.type = 0
+		limit 0,50
+	</select>
 </mapper>

+ 32 - 17
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -2,11 +2,13 @@ package com.goafanti.memberGrade.controller;
 
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,12 +18,14 @@ 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.enums.OrderState;
 import com.goafanti.common.model.MemberOrder;
 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;
+import com.goafanti.memberGrade.service.MemberOrderService;
 
 /**
  * 会员等级管理 后台
@@ -33,7 +37,9 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RequestMapping(value = "/api/admin/member")
 public class MemberGradeController extends BaseApiController {
 	@Autowired
-	private MemberGradeService memberGradeService;
+	private MemberGradeService	memberGradeService;
+	@Autowired
+	private MemberOrderService	memberOrderService;
 
 	/**
 	 * 查询全部信息
@@ -140,22 +146,31 @@ public class MemberGradeController extends BaseApiController {
 	 * @return
 	 */
 	@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, String paymentId) {
-		Map<String, Object> umap = new HashMap<>();
-		umap.put("userId", userId);
-		umap.put("lvl", memberRank);
-		Map<String, Object> map = new HashMap<>();
-		map.put("id", id);
-		map.put("menberType", memberRank);
-		map.put("validMonth", validMonth);
-		map.put("paymentValue", paymentValue);
-		map.put("orderState", orderState);
-		map.put("paymentTime", paymentTime);
-		map.put("paymentType", paymentType);
-		map.put("paymentId", paymentId);
-		memberGradeService.updateMemberOrder(map, umap);
-		return res().data(1);
+	public Result updateMemberOrder(Long id, String memberRank, String validMonth, String paymentValue,
+			String orderState, String paymentTime, String paymentType, String userId, String paymentId) {
+		MemberOrder mo = memberOrderService.getById(id);
+		Assert.notNull(mo, "找不到订单");
+		mo.setOrderState(OrderState.getStatus(orderState).getCode());
+		try {
+			Integer month = Integer.parseInt(validMonth);
+			mo.setValidMonth(month);
+			mo.setMenberType(Integer.parseInt(memberRank));
+			if (OrderState.isPayed(OrderState.getStatus(mo.getOrderState()))) {
+				Assert.hasText(paymentId, "已支付订单信息不完整");
+				Assert.hasText(paymentType, "已支付订单信息不完整");
+				Assert.hasText(paymentTime, "已支付订单信息不完整");
+				mo.setPaymentId(paymentId);
+				mo.setPaymentType(paymentType);
+				mo.setPaymentValue(Double.parseDouble(paymentValue));
+				Date payTime = DateUtils.parseDate(paymentTime, AFTConstants.YYYYMMDDHHMMSS);
+				Date validTime = DateUtils.addMonths(payTime, month);
+				mo.setValidTime(validTime);
+				mo.setPaymentTime(payTime);
+			}
+		} catch (ParseException e) {
+			return res().error(buildError("", "参数错误"));
+		}
+		return res().data(memberOrderService.update(mo));
 	}
 
 	/**

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

@@ -59,10 +59,10 @@ public class MemberGradeService {
 	}
 
 	public void updateMemberOrder(Map<String, Object> map, Map<String, Object> umap) {
-		memberGradeMapper.updateMemberOrder(map);
 		if (OrderState.getStatus((Integer) map.get("orderState")) == OrderState.PAYED) {
 			memberGradeMapper.updateUserLvl(umap);
 		}
+		memberGradeMapper.updateMemberOrder(map);
 	}
 
 	public int delMemberOrder(Long id) {

+ 31 - 0
src/main/java/com/goafanti/memberGrade/service/MemberOrderService.java

@@ -0,0 +1,31 @@
+package com.goafanti.memberGrade.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.MemberOrderMapper;
+import com.goafanti.common.enums.OrderState;
+import com.goafanti.common.model.MemberOrder;
+
+@Service
+public class MemberOrderService {
+	@Autowired
+	private MemberOrderMapper memberOrderMapper;
+
+	public MemberOrder getById(Long id) {
+		return memberOrderMapper.selectByPrimaryKey(id);
+	}
+
+	public int update(MemberOrder mo) {
+		if (OrderState.isPayed(OrderState.getStatus(mo.getOrderState()))) {
+			Map<String, Object> umap = new HashMap<>();
+			umap.put("lvl", mo.getMenberType());
+			umap.put("userId", mo.getUserId());
+			memberOrderMapper.updateUserLvl(umap);
+		}
+		return memberOrderMapper.updateByPrimaryKeySelective(mo);
+	}
+}

+ 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


+ 5 - 8
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -34,14 +34,14 @@
 				<img th:src="${portalHost + '/img/finance_fund.png'}" alt="" />
 				<div class="fund_cont">
 					<h1>我要找资金</h1>
-					<p>让好项目不缺钱</p>
+					<p>免费入驻 约见行业投资大咖</p>
 				</div>
 			</div>
 			<div class="project">
 				<img th:src="${portalHost + '/img/finance_projict.png'}" alt="" />
 				<div class="project_cont">
 					<h1>我要找项目</h1>
-					<p>让钱有地儿花</p>
+					<p>精选项目 共同打造创新商机</p>
 				</div>
 			</div>
 		</div>
@@ -49,7 +49,7 @@
 	<div id="finance_tab_one">
 		<div id="fund_begin">
 			<div class="script">
-				<h1>找资金从这里开始</h1>
+				<h1>找资金从这里开始</h1>
 			</div>
 			<div class="classify">
 				<div>
@@ -143,7 +143,7 @@
 	<div id="finance_tab_two">
 		<div id="fund_begin_two">
 			<div class="script">
-				<h1>找资金从这里开始</h1>
+				<h1>找项目,从这里开始</h1>
 			</div>
 			<div class="classify">
 				<div>
@@ -241,9 +241,7 @@
 		</div>
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
-				<ul id="demandList_patent">
-<<<<<<< HEAD
-=======
+				<ul id="demandList_patent">
 					<!-- <li><img src="../img/allproduct_img.png" alt="" />
 						<div class="details_text">
 							<p>
@@ -265,7 +263,6 @@
 								项目名 <span> 医疗四分局王死哦风景</span>
 							</p>
 						</div></li> -->
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 				</ul>
 			</div>
 			<div class="pagination_box">

+ 36 - 28
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,29 +57,37 @@
  	<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">
-			<p>科技服务促销</p>
+			<p>强势放价 (迎国庆)</p>
 		</div>
 		<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>

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

@@ -1,56 +1,59 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org"
-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技服务</title>
-<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-<link th:href="${portalHost + '/member.css'}" rel="stylesheet">
+	<title>科技服务</title>
+	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/member.css'}" rel="stylesheet">
 </head>
+
 <body>
 	<header>
 		<div th:replace="common::nav('','')"></div>
 	</header>
-		<!--主体内容区域开始-->
+	<!--主体内容区域开始-->
 	<div class="member">
 		<div class="member_contant">
 			<h3>申请会员获得更多增值服务</h3>
-			<div class="member_main">							
+			<div class="member_main">
 				<div class="member_on">
 					<h5><img th:src="${portalHost + '/img/member_1.jpg'}" alt="" />提供的专属服务</h5>
-					<p>科技成果,专家信息定点推送</p>
-					<p>查看专家的联系方式</p>
-					<p>任何业务申请,付费业享受会员专属折扣</p>
-					<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
-					<p>一对一的科技咨询师服务</p>
-					<ul class="member_left">
-						<li>1400元/6个月</li>
-						<li  class="then"><span>限时折扣</span><br /><time>800元/3个月</time></li>
-						<li>2000元/12个月</li>
+					<div class="member_business_list" id="member1business">
+					</div>
+					<ul class="member_left" id="member1cost">
 					</ul>
-				</div>	
+				</div>
 				<div class="partingline"></div>
-				<div class="member_on">	
+				<div class="member_on">
 					<h5 class="blur"><img th:src="${portalHost + '/img/member_2.jpg'}" alt="" />提供的专属服务</h5>
-					<p>科技成果,专家信息定点推送</p>
-					<p>查看专家的联系方式</p>
-					<p>任何业务申请,付费业享受会员专属折扣</p>
-					<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
-					<p>一对一的科技咨询师服务</p>
-					<p>一对一的专业技术顾问,搜集技术情报,提供研发高参</p>
-					<ul>
-						<li>3500元/6个月</li>
-						<li class="then"><span>限时折扣</span><br /><time>2000元/3个月</time></li>
-						<li>5000元/12个月</li>
+					<div class="member_business_list" id="member2business">
+					</div>
+					<ul id="member2cost">
 					</ul>
-				</div>	
+				</div>
 			</div>
-			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold"/>
-			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond"/>
-									
+			<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="" />
 		</div>
-		<div  class="shadow">
-		<img th:src="${portalHost + '/img/shadow7.png'}" alt=""/>
+	</div>
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel">会员订单提交</h4>
+				</div>
+				<div class="modal-body" id="modal-content">
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button type="button" class="btn btn-primary" id="submitOrder">提交订单</button>
+				</div>
+			</div>
 		</div>
 	</div>
 	<!--主体内容区域结束-->
@@ -64,4 +67,5 @@
 		<script type="text/javascript" th:src="${portalHost + '/service.js'}"></script>
 	</div>
 </body>
+
 </html>

+ 2 - 5
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -2,13 +2,11 @@
 <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>
@@ -21,10 +19,10 @@
 					<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">
+				<div th:if="${newsDetail.titleImg != null and newsDetail.titleImg !=''}" class="content_img">					
 					<img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
 				</div>
-				<p  th:text="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
+				<p th:utext="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
 				</p>
 				<h5 class="text_end">文章来自:</h5>
 				<a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
@@ -39,7 +37,6 @@
 						<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>

+ 51 - 43
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -13,9 +13,9 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTechCognizance_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTechCognizance_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTechCognizance_banner01.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
@@ -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>

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

@@ -32,6 +32,14 @@
   		<div class="achievement_top"><img th:src="${portalHost + '/img/achievement_01.png'}" alt=""/></div>  		
   	</div>
   	<div class="container">
+  		
+  		<div th:if="${keyWord} != null "  id="keyword1">
+			<p th:text="${keyWord}"></p>
+		</div>
+		<div th:if="${keyWord} == null " id="keyword2">
+			<p></p>
+		</div>
+  		
   		<div class="achievement_header">
   			<p>全部结果: </p>
   			<ul>
@@ -119,7 +127,7 @@
 							<div class="inp_select">
 								<input type="number" name="" id="minprice" placeholder="最小价格" maxlength="6" min="0"/>
 								<span>-</span>
-								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
+								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
 								<button>确定</button>
 							</div>
 						</li>

+ 6 - 12
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -24,23 +24,17 @@
 						alt="" /></a>
 				</div>-->				
 				<div class="detail_toptitle">
-					<a href="#">技术交易&nbsp;&nbsp;></a> <a href="#">技术专利&nbsp;&nbsp;></a> <a href="#"
+					<a href="/portal/technologyTrading/index.html">技术交易&nbsp;&nbsp;></a> <a href="/portal/technologyTrading/achievement.html">技术专利&nbsp;&nbsp;></a> <a href="#"
 						class="a_detail">专利详情</a>
 				</div>
 			</div>
 			<div class="detail_center">
-				<div class="detail_centerimg">
+				<div class="detail_centerimg" th:each="achievementdetail:${achievementdetail}">
 					<div>
-						<!-- <div class="small_img" th:each="detail:${achievementdetail}">
-						    <ul th:if="#{!detail.pictureList.empty}">
-								<li th:each="pic:${detail.pictureList}">
-									<img alt="" th:src="${globalConfig.avatarUploadHost + pic}">
-								</li>
-							</ul>
-							<ul th:if="#{detail.pictureList.empty}">
-							</ul>
-						</div> -->
-						<div class="big_img" th:each="achievementdetail:${achievementdetail}">
+						<div th:if="${achievementdetail.technicalPictureUrl} == null " >
+							<img th:src="${avatarUploadHost+ '/default/bigimg_null.png'}" alt=""/>
+						</div>
+						<div th:if="${achievementdetail.technicalPictureUrl} != null " >
 							<img th:src= "${avatarUploadHost+achievementdetail.technicalPictureUrl}"alt="" />
 						</div>
 					</div>

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

@@ -101,7 +101,7 @@
 							<div class="inp_select">
 								<input type="number" name="" id="minprice" placeholder="最小价格" maxlength="6" min="0"/>
 								<span>-</span>
-								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
+								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
 								<button>确定</button>
 							</div>
 						</li>

+ 7 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -22,7 +22,7 @@
 					<a href="#"> <img th:src="${portalHost + '/img/detail_weibo.jpg'}" alt="" /></a>
 				</div> -->
 				<div class="detail_toptitle" th:each="demand:${demand}">
-					<a href="#">技术交易&nbsp;&nbsp;></a>  <a href="#">技术需求&nbsp;&nbsp;></a>  <a href="#"class="a_detail" th:text="${demand.name}">关于超细颗粒金属碳化物的制造技术</a>
+					<a href="/portal/technologyTrading/index.html">技术交易&nbsp;&nbsp;></a>  <a href="/portal/technologyTrading/demand.html">技术需求&nbsp;&nbsp;></a>  <a href="#"class="a_detail" th:text="${demand.name}">关于超细颗粒金属碳化物的制造技术</a>
 				</div>
 			</div>
 			<div class="detail_center">
@@ -31,7 +31,12 @@
 						<h3 th:text="${demand.name}"></h3>
 					</div>
 					<div class="big_img">
-						<img th:src= "${avatarUploadHost+demand.pictureUrl}?${avatarUploadHost+demand.pictureUrl}:${avatarUploadHost+ 'default/xuqiuimg_null.png'}"alt="" />
+						<div th:if="${demand.pictureUrl} == null " >
+							<img th:src="${avatarUploadHost+ '/default/bigimg_null.png'}" alt=""/>
+						</div>
+						<div th:if="${demand.pictureUrl} != null " >
+							<img th:src= "${avatarUploadHost+demand.pictureUrl}"alt="" />
+						</div>
 					</div>
 					<div class="basic">
 						<div>

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


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

@@ -32,14 +32,14 @@
 				<img th:src="${portalHost + '/img/think_blur1.png'}" alt="" />
 				<div class="img_right">
 					<h4>智政</h4>
-					<p>您身边为您出谋划策的智者</p>
+					<p>专业解读您所需的锦囊妙计</p>
 				</div>
 			</div>
 			<div class="col-md-6  zone_right">
 				<img th:src="${portalHost + '/img/think_bai1.png'}" alt="" />
 				<div class="img_right">
 					<h4>智者</h4>
-					<p>您身边为您出谋划策的智者</p>
+					<p>您困惑中的指明灯</p>
 				</div>
 			</div>
 		</div>
@@ -48,8 +48,8 @@
 			<div class="search_left">
 				<img th:src="${portalHost + '/img/think_03.png'}" alt="" />
 				<div class="img_txt">
-					<h4>海量专家</h4>
-					<p>严选超过8千位行家专属服务</p>
+					<h4>权威专家</h4>
+					<p>汇聚各领域权威专家</p>
 				</div>
 			</div>
 			<div class="search_left">

+ 6 - 71
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -11,7 +11,9 @@
 	<header>
 		<div th:replace="common::nav('user','subscriberDetail')"></div>
 	</header>
-
+	<div class="banner">
+    	<img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/>
+	</div>
 	<div id="all_thinkerDetail">
 		<div class="thinkerdetail_top" th:each="rePartnerDetail:${rePartnerDetail}">
 			 <div>
@@ -79,81 +81,14 @@
 					<div>
 						<div class="people_img"> <img th:src= "${avatarUploadHost+reuserPartner.personPortraitUrl}"alt="" /> </div>
 						<div class="people_text">
-							<h5 th:text="${reuserPartner.username}?${reuserPartner.username}:11111111">纣洪涛</h5>
-							<span th:text="${reuserPartner.position}?${reuserPartner.position}:1111111"></span>
-							<p th:text="${reuserPartner.personalProfile}?${reuserPartner.personalProfile}:暂无简介">哈佛舒服舒服返回上返回是否合适覅和双飞粉石灰粉长沙长沙</p>
+							<h5 th:text="${reuserPartner.username}?${reuserPartner.username}:佚名"></h5>
+							<span th:text="${reuserPartner.position}?${reuserPartner.position}:未公开"></span>
+							<p th:text="${reuserPartner.personalProfile}?${reuserPartner.personalProfile}:暂无简介"></p>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-		<!-- <div class="thinkdetail_bottom">
-			<div class="bottom_title">
-				<div>
-					一起来倾听客户的声音
-					<h3>智者评价</h3>
-					<div></div>
-				</div>
-			</div>
-			<div class="bottom_cont">
-				<div>
-					<div class="bottom_conttext">很符合我是否合法 即佛了辐射服 接送费聚四氟及反思和方式飞
-						就爱减肥 佛啊减肥</div>
-					<img src="../../img/thinker_detail5.png" alt="" />
-					<div>
-						<div class="bottompeople_img"></div>
-						<div class="bottompeople_text">
-							<h5>纣洪涛</h5>
-							<span>妇女协会会长</span>
-						</div>
-					</div>
-				</div>
-				<div>
-					<div class="bottom_conttext">非常牛逼</div>
-					<img src="../../img/thinker_detail3.png" alt="" />
-					<div>
-						<div class="bottompeople_img"></div>
-						<div class="bottompeople_text">
-							<h5>纣洪涛</h5>
-							<span>妇女协会会长</span>
-						</div>
-					</div>
-				</div>
-				<div>
-					<div class="bottom_conttext">很好</div>
-					<img src="../../img/thinker_detail5.png" alt="" />
-					<div>
-						<div class="bottompeople_img"></div>
-						<div class="bottompeople_text">
-							<h5>纣洪涛</h5>
-							<span>妇女协会会长</span>
-						</div>
-					</div>
-				</div>
-				<div>
-					<div class="bottom_conttext">太厉害了</div>
-					<img src="../../img/thinker_detail5.png" alt="" />
-					<div>
-						<div class="bottompeople_img"></div>
-						<div class="bottompeople_text">
-							<h5>纣洪涛</h5>
-							<span>妇女协会会长</span>
-						</div>
-					</div>
-				</div>
-				<div>
-					<div class="bottom_conttext">看着就想买</div>
-					<img src="../../img/thinker_detail5.png" alt="" />
-					<div>
-						<div class="bottompeople_img"></div>
-						<div class="bottompeople_text">
-							<h5>纣洪涛</h5>
-							<span>妇女协会会长</span>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div> -->
 	</div>
 
 	<footer>