Browse Source

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

Conflicts:
	src/main/java/com/goafanti/common/mapper/DemandMapper.xml
zou_ht 8 years ago
parent
commit
7a9143281a
22 changed files with 930 additions and 346 deletions
  1. 7 2
      src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java
  2. 6 0
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  3. 110 4
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  4. 12 0
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  5. 3 2
      src/main/java/com/goafanti/news/controller/NewsController.java
  6. 4 1
      src/main/java/com/goafanti/news/service/NewsService.java
  7. 1 3
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  8. 117 0
      src/main/java/com/goafanti/portal/bo/FinancialListBo.java
  9. 75 0
      src/main/java/com/goafanti/portal/controller/PortalFinancialController.java
  10. 28 0
      src/main/java/com/goafanti/portal/service/PortalFinancialService.java
  11. 43 0
      src/main/java/com/goafanti/portal/service/impl/PortalFinancialServiceImpl.java
  12. 1 1
      src/main/resources/props/config_local.properties
  13. 17 4
      src/main/webapp/WEB-INF/views/common.html
  14. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  15. 113 0
      src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html
  16. 116 0
      src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html
  17. 1 0
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  18. 38 152
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  19. 41 164
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  20. 11 11
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  21. 184 0
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html
  22. 1 1
      src/main/webapp/WEB-INF/views/user/signIn.html

+ 7 - 2
src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java

@@ -1,6 +1,9 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrganizationInfo;
+import com.goafanti.portal.bo.FinancialListBo;
 
 public interface OrganizationInfoMapper {
     int deleteByPrimaryKey(String id);
@@ -14,8 +17,10 @@ public interface OrganizationInfoMapper {
     int updateByPrimaryKeySelective(OrganizationInfo record);
 
     int updateByPrimaryKey(OrganizationInfo record);
-    
-    
 
 	OrganizationInfo selectOrgInfoByUserId(String uid);
+	
+	List<FinancialListBo> selectRecommendCompany();
+	
+	FinancialListBo selectCompanyDetai(String companyId);
 }

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

@@ -240,6 +240,9 @@
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
 		</if>
+		<if test="keyword != null">
+			and a.title like concat('%',#{keyword},'%')
+		</if>
 		 -->
 		order by create_time desc
 		<if test="page_sql != null">
@@ -262,6 +265,9 @@
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
 		</if>
+		<if test="keyword != null">
+			and a.title like concat('%',#{keyword},'%')
+		</if>
 		-->
 	</select>
 </mapper>

+ 110 - 4
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -15,11 +15,12 @@
     <result column="logo_url" property="logoUrl" jdbcType="VARCHAR" />
     <result column="publicity_picture_url" property="publicityPictureUrl" jdbcType="VARCHAR" />
     <result column="country_name_zh" jdbcType="VARCHAR" property="countryNameZh" />
+    <result column="company_type" property="companyType" jdbcType="INTEGER"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, identity_type, company_name, location_province, location_city,location_area,
     unit_size, company_introduction, 
-    home_unit,  logo_url, publicity_picture_url,country_name_zh
+    home_unit,  logo_url, publicity_picture_url,country_name_zh,company_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -36,13 +37,14 @@
       company_name, location_province, location_city,location_area,
       unit_size, 
       company_introduction, home_unit,  
-      logo_url, publicity_picture_url,country_name_zh)
+      logo_url, publicity_picture_url,country_name_zh,company_type)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR},
       #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
-      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR}, #{countryNameZh,jdbcType=VARCHAR})
+      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR}, #{countryNameZh,jdbcType=VARCHAR},
+      #{companyType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
     insert into organization_info
@@ -86,6 +88,9 @@
       <if test="countryNameZh != null">
       	country_name_zh,
       </if>
+      <if test="companyType != null">
+      	company_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -127,6 +132,9 @@
       <if test="countryNameZh != null">
       	#{countryNameZh,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+      	#{companyType,jdbcType=INTEGER}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
@@ -168,6 +176,9 @@
       <if test="countryNameZh != null">
       	country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+      	company_type = #{companyType,jdbcType=INTEGER}
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -184,7 +195,8 @@
       home_unit = #{homeUnit,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
       publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
-      country_name_zh = #{countryNameZh,jdbcType=VARCHAR}
+      country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
+      company_typ e= #{companyType,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -194,4 +206,98 @@
     from organization_info
     where uid = #{uid,jdbcType=VARCHAR}
   </select>
+  
+  <select id="selectRecommendCompany" resultType="com.goafanti.portal.bo.FinancialListBo">
+  	select 
+  		b.id,
+  		b.company_name  as companyName,
+  		b.logo_url as logoUrl,
+  		b.publicity_picture_url as publicityPictureUrl,
+  		b.company_introduction as companyIntroduction
+	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		a.id = c.uid
+	where b.id is not null 
+	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	order by 
+		a.create_time asc 
+	limit 0,10
+  </select>
+  
+  <select id="selectFinancialByPage" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.FinancialListBo">
+  	select 
+  		b.id,
+  		b.company_name as companyName,
+  		b.logo_url as logoUrl,
+  		b.publicity_picture_url as publicityPictureUrl,
+  		b.company_introduction as companyIntroduction
+	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		a.id = c.uid
+	where 
+	a.type = 1 and b.id is not null
+	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	<if test="locationProvince != null and locationProvince != ''">
+		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
+	</if>
+	order by 
+		a.create_time desc
+	<if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+  <select id="selectFinancialCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(0)
+  	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		a.id = c.uid
+	where 
+	a.type = 1 and b.id is not null
+	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	<if test="provinceId != null and provinceId != ''">
+		and b.location_province = #{provinceId,jdbcType=VARCHAR}
+	</if>
+	<if test="keyword != null and keyword !=''">
+		and b.company_name like concat('%',#{keyword},'%')  
+	</if>
+  </select>
+  
+  <select id="selectCompanyDetai" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.FinancialListBo">
+	select
+		b.company_name as companyName,
+		b.logo_url as logoUrl,
+		b.publicity_picture_url as publicityPictureUrl,
+		b.company_introduction as companyIntroduction,
+		d.ability_label as abilityLabel,
+		e.name as companyLocation
+	from user a 
+	left join organization_info b on a.id = b.uid 
+	left join user_identity c on a.id = c.uid 
+	left join user_ability d on a.id = d.uid
+	left join district_glossory e on b.location_province = e.id
+	where b.id = #{organizationId,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -60,6 +60,10 @@ public class OrganizationInfo {
      * 国际中文名
      */
     private String 	countryNameZh;
+    /**
+     *  企业类型 1-投产公司
+     */
+    private Integer companyType;
     
 	public String getId() {
 		return id;
@@ -164,4 +168,12 @@ public class OrganizationInfo {
 	public void setCountryNameZh(String countryNameZh) {
 		this.countryNameZh = countryNameZh;
 	}
+
+	public Integer getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(Integer companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -74,7 +74,7 @@ public class NewsController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
 	@ResponseBody
-	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot,Integer provinceId) {
+	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)) {
@@ -83,7 +83,7 @@ public class NewsController extends BaseController {
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 		}
-		res.setData(newsService.portalNewsList(pSize,pNo, type,hot,provinceId));
+		res.setData(newsService.portalNewsList(pSize,pNo, type,hot,provinceId,keyword));
 		return res;
 	}
 
@@ -106,6 +106,7 @@ public class NewsController extends BaseController {
 	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/news/newsDetail");
 		return modelview;
+		
 	}
 
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {

+ 4 - 1
src/main/java/com/goafanti/news/service/NewsService.java

@@ -142,7 +142,7 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 	}
 	
 	@SuppressWarnings("unchecked")
-	public Pagination<NewsPortalList> portalNewsList(Integer pSize, Integer pNo, Integer type,Integer hot,Integer provinceId) {
+	public Pagination<NewsPortalList> portalNewsList(Integer pSize, Integer pNo, Integer type,Integer hot,Integer provinceId,String keyword) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if (null != hot){
 			params.put("hot", hot);
@@ -153,6 +153,9 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		if(null != provinceId){
 			params.put("provinceId", provinceId);
 		}
+		if(null != keyword){
+			params.put("keyword", keyword);
+		}
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

+ 1 - 3
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.Achievement;
 
 public class AchievementSearchListBo {
 	private String		id;
@@ -261,7 +262,4 @@ public class AchievementSearchListBo {
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 	}
-	
-	
-
 }

+ 117 - 0
src/main/java/com/goafanti/portal/bo/FinancialListBo.java

@@ -0,0 +1,117 @@
+package com.goafanti.portal.bo;
+
+public class FinancialListBo{
+	
+	private String id;
+	/**
+	 * 公司名称
+	 */
+	private String	companyName;
+
+	/**
+	 * 所在地--省
+	 */
+	private Integer	locationProvince;
+	
+	/**
+	 * logo图
+	 */
+	private String	logoUrl;
+	
+	/**
+	 * 宣传图片
+	 */
+	private String	publicityPictureUrl;
+	
+	/**
+     *  企业类型  1-投产公司
+     */
+    private Integer companyType;
+    
+    /**
+	 * 单位简介
+	 */
+	private String	companyIntroduction;
+
+	/**
+	 * 能力标签
+	 */
+	private String abilityLabel;
+	
+	/**
+	 *  公司所在地
+	 */
+	private String companyLocation;
+	
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public Integer getLocationProvince() {
+		return locationProvince;
+	}
+
+	public void setLocationProvince(Integer locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public String getLogoUrl() {
+		return logoUrl;
+	}
+
+	public void setLogoUrl(String logoUrl) {
+		this.logoUrl = logoUrl;
+	}
+
+	public String getPublicityPictureUrl() {
+		return publicityPictureUrl;
+	}
+
+	public void setPublicityPictureUrl(String publicityPictureUrl) {
+		this.publicityPictureUrl = publicityPictureUrl;
+	}
+
+	public Integer getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(Integer companyType) {
+		this.companyType = companyType;
+	}
+
+	public String getCompanyIntroduction() {
+		return companyIntroduction;
+	}
+
+	public void setCompanyIntroduction(String companyIntroduction) {
+		this.companyIntroduction = companyIntroduction;
+	}
+
+	public String getAbilityLabel() {
+		return abilityLabel;
+	}
+
+	public void setAbilityLabel(String abilityLabel) {
+		this.abilityLabel = abilityLabel;
+	}
+
+	public String getCompanyLocation() {
+		return companyLocation;
+	}
+
+	public void setCompanyLocation(String companyLocation) {
+		this.companyLocation = companyLocation;
+	}
+}

+ 75 - 0
src/main/java/com/goafanti/portal/controller/PortalFinancialController.java

@@ -0,0 +1,75 @@
+package com.goafanti.portal.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+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.common.bo.Result;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+import com.goafanti.portal.service.PortalFinancialService;
+
+/**
+ * 
+ * @author Administrator
+ *	科技金融
+ */
+@Controller
+public class PortalFinancialController extends BaseController{
+	
+	@Resource
+	private PortalFinancialService portalFinancialService;
+	
+	/**
+	 * 金融首页
+	 * @return
+	 */
+	@RequestMapping(value="/portal/financial/investmentInstitution",method = RequestMethod.GET)
+	public ModelAndView investmentInstitution(){
+		ModelAndView mv = new ModelAndView();
+		List<FinancialListBo> recommendCompanyList = portalFinancialService.selectRecommendCompany();
+		mv.addObject("recommendCompanyList", recommendCompanyList);
+		mv.setViewName("/portal/financial/investmentInstitution");
+		return mv;
+	}
+	
+	/**
+	 * 金融机构查询 
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/financial/search", method = RequestMethod.GET)
+	@ResponseBody
+	public Result financialSearch(Integer provinceId,String keyword,Integer pageSize,Integer pageNo){
+		pageSize = pageSize == null ? 10 : pageSize;
+		pageNo = pageNo == null ? 10 : pageNo;
+		Result result = new Result();
+		Pagination<FinancialListBo> financialCompanyList = 
+				portalFinancialService.selectFinancialByPage(provinceId,keyword,pageSize,pageNo);
+		result.data(financialCompanyList);
+		return result;
+	}
+	
+	/**
+	 * 金融机构详情
+	 * @param organizationId
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/financial/investmentDetail", method = RequestMethod.GET)
+	public ModelAndView investmentDetail(String organizationId){
+		ModelAndView mv = new ModelAndView();
+		FinancialListBo bo = portalFinancialService.selectCompanyDetail(organizationId);
+		List<FinancialListBo> recommendCompanyList = portalFinancialService.selectRecommendCompany();
+		mv.addObject("recommendCompanyList", recommendCompanyList);
+		mv.addObject("bo", bo);
+		mv.setViewName("/portal/financial/investmentDetail");
+		return mv;
+	}
+	
+}

+ 28 - 0
src/main/java/com/goafanti/portal/service/PortalFinancialService.java

@@ -0,0 +1,28 @@
+package com.goafanti.portal.service;
+
+import java.util.List;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+
+public interface PortalFinancialService {
+	/**
+	 * 
+	 * @return 推荐列表
+	 */
+	public List<FinancialListBo> selectRecommendCompany();
+	
+	/**
+	 * 
+	 * @return 金融机构查询
+	 */
+	public Pagination<FinancialListBo> selectFinancialByPage(Integer provinceId,String keyword,Integer pageSize,Integer pageNo);
+	
+	
+	/**
+	 * 金融机构详情
+	 * @param companyId
+	 * @return
+	 */
+	public FinancialListBo selectCompanyDetail(String companyId);
+}

+ 43 - 0
src/main/java/com/goafanti/portal/service/impl/PortalFinancialServiceImpl.java

@@ -0,0 +1,43 @@
+package com.goafanti.portal.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationInfoMapper;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+import com.goafanti.portal.service.PortalFinancialService;
+
+@Service
+public class PortalFinancialServiceImpl extends BaseMybatisDao<OrganizationInfoMapper> implements PortalFinancialService {
+	
+	@Autowired
+	private OrganizationInfoMapper organizationInfoMapper;
+	@Override
+	public List<FinancialListBo> selectRecommendCompany() {
+		return organizationInfoMapper.selectRecommendCompany();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<FinancialListBo> selectFinancialByPage(Integer provinceId,String keyword,Integer pageSize,Integer pageNo) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(null != provinceId) params.put("provinceId", provinceId);
+		if(StringUtils.isNotBlank(keyword)) params.put("keyword", keyword);
+		Pagination<FinancialListBo> result = 
+				(Pagination<FinancialListBo>) findPage("selectFinancialByPage","selectFinancialCount",params,pageNo,pageSize);
+		return result;
+	}
+
+	@Override
+	public FinancialListBo selectCompanyDetail(String organizationId) {
+		return organizationInfoMapper.selectCompanyDetai(organizationId);
+	}
+
+}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/front/2.0.0
+static.host=//sb.jishutao.com/1.0.41
 portal.host=//sf.jishutao.com/portal/2.0.0
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload

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

@@ -33,19 +33,31 @@
   					</li>
   					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
   						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
-  						<ol>
-  							<li th:classappend="${subM=='achievement'}? 'active'">
+  						<ol class="subnavigation">
+  							<li>
   								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">科技专利</a>
   							</li>
-  							<li th:classappend="${subM=='demand'}? 'active'">
+  							<li>
   								<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">科技需求</a>
   							</li>
   						</ol>
   					</li>
   					<li th:classappend="${mainM=='thinkTank'}? 'active'">
   						<a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
+  						<ol class="subnavigation">
+  							<li>
+  								<a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a>
+  							</li>
+  						</ol>
+  					</li>
+  					<li>
+  						<a th:href="${basePath + '/portal/financial/index.html'}">科技金融</a>
+  						<ol class="subnavigation">
+  							<li>
+  								<a th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构</a>
+  							</li>
+  						</ol>
   					</li>
-  					<li><a href="#">科技金融</a></li>
   					<li><a href="#">科技活动</a></li>
   					<li><a href="#">平台共建</a></li> 					
   				</ul>
@@ -207,6 +219,7 @@
 			</div>
 			<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
 		</div>
+		<div class="smg"><input type="text" name="msg" value="" id="msg" readonly="readonly"/></div>
 	</th:block>
 	<th:block th:fragment="footer(scripts)">
 		<script th:inline="javascript">

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

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

+ 113 - 0
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -0,0 +1,113 @@
+<!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 + '/financial/investmentDetail.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('financial','investmentDetail')"></div>
+	</header>
+	<!--banner-->
+  	<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=3 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+ 	<div class="main_top">
+    	<div class="head_bj">
+	    	<div class="container">    		           
+	            <ul class="detail_toptitle">
+	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
+	            	<li>></li>
+	                <li><a href="#">科技金融  </a></li>
+	                <li>></li>               
+	                <li><a href="#">我要找资金   </a></li>
+	                <li>></li>
+	                <li><a href="#" >投资机构 </a></li>
+	                <li>></li>
+	             	<li class="that" th:text="${bo.companyName}"></li>
+	            </ul>
+	        </div>
+	    </div>    
+        <div class="detail_contant container">
+        	<div class="detail_left">
+        		<div class="introduction">
+        			<h4>机构简介</h4>
+        			<p th:text="${bo.companyIntroduction}"></p>
+        		</div>
+        		<div class="list_logo">
+        			<h4>投资案例</h4>
+        			<div class="list_imgs">
+        				<span class="need_prev"><img th:src="${portalHost + '/img/inverDetails_left.png'}" alt="" /></span>
+            			<div class="list_width need_imgs">
+	            			<ol>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>	
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>		            			   
+	            			</ol>
+            			</div>
+            			<span class="need_next"><img th:src="${portalHost + '/img/inverDatauuils_30.png'}" alt="" /></span>
+        			</div>
+        		</div>
+        	</div>
+        	<div class="detail_right">
+        		<div class="institutions_top">
+        			<div class="institutions_love">
+        				<img th:src="${portalHost + '/img/inverDetails_01.png'}" alt="" />
+        				<div class="love_text">
+        					<p><img th:src="${portalHost + '/img/inverDatails_love.png'}" alt="" /><span> 12 </span> 收藏</p>
+        					<p>线下约见<span> 32次</span></p>
+        				</div>
+        			</div>        			
+        			<h4 th:text="${bo.companyName}"></h4>
+        			<p>所在地:   <span th:text=${bo.companyLocation}></span></p>
+        			<a href="">在线咨询</a>       			
+        		</div>
+        		<div class="institutions_bottom">
+        			<h4>相关机构</h4>
+        			<ul>
+       				<li th:each="company : ${recommendCompanyList}">
+       						<img th:src="${portalHost + company.logoUrl}" alt="" />
+       						<a th:href="@{/portal/financial/investmentDetail(organizationId=${company.id})}">
+	       						<p th:text="${company.companyName}"></p>
+	       						<p th:text="${company.companyIntroduction}"></p>
+       						</a>
+       					</li> 				
+       				</ul>
+        		</div>
+        	</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 + '/financial/investmentDetail.js'}"></script>
+	</div>
+</body>
+</html>

+ 116 - 0
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -0,0 +1,116 @@
+<!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 + '/financial/investmentInstitution.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('financial','investmentInstitution')"></div>
+	</header>
+	<!--banner-->
+  	<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=3 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+    <div class="main_top">
+    	<div class="head_bj">
+	    	<div class="container">    		           
+	            <ul class="detail_toptitle">
+	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
+	            	<li>></li>
+	                <li><a href="#">科技金融 </a></li>
+	                <li>></li>               
+	                <li><a href="#">我要找资金  </a></li>
+	                <li>></li>
+	                <li class="that"><a href="#" >投资机构 </a></li>
+	            </ul>
+	            <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="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<div id="search_on">					
+		 					<input type="search" placeholder="高新"/>
+		 				</div>
+		 				<button id="btn_search"></button>						 			
+			 		</div>
+			 	</div>
+			</div>	       
+	    </div>	   
+        <div class="invest_midt  container">
+       		<h6>投资机构</h6>
+       		<div class="invest_contant">
+       			<div class="invest_left">      				
+       				<div class="invest_imglist">
+       					<ul>
+       					</ul>
+       				</div>
+       				<div class="pagination_box">
+						<nav aria-label="Page navigation" class="clearfix">							
+							<ul class="pagination">								
+								<li class="pagePre">
+									<a href="#" aria-label="Previous">
+										<span aria-hidden="true">首页</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">末页</span>
+									</a>
+								</li>
+							</ul>
+							<span class="totalCount">共 2 页 0 条数据</span>
+						</nav>
+					</div>
+       			</div>
+       			<div class="invest_right">
+       				<h5>推荐机构</h5>
+       				<ul>		
+       					<li th:each="company : ${recommendCompanyList}">
+       						<img th:src="${portalHost + company.logoUrl}" alt="" />
+       						<a th:href="@{/portal/financial/investmentDetail(organizationId=${company.id})}">
+	       						<p th:text="${company.companyName}"></p>
+	       						<p th:text="${company.companyIntroduction}"></p>
+       						</a>
+       					</li>     					
+       				</ul>
+       			</div> 
+       		</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 + '/financial/investmentInstitution.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -321,6 +321,7 @@
   	<div class="img_city"></div>
 	<footer>
 		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">

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

@@ -13,37 +13,40 @@
 	<!--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>
+			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a src=""><img th:src="${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 class="btn btn-next" src="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
-		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		<a class="btn btn-pre" src="">
+			<img th:src="${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 class="achievement_top"><img th:src="${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"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   				<li>  					
-  					<p>教育休闲111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   			</ul>
+  			<div class="text_replace">
+  				<img th:src="${portalHost + '/img/achievement_01_next.jpg'}" alt="" /><span></span>
+  			</div>
   		</div>
   		<div class="wrap active">
 			<div class="portal-body">
@@ -56,15 +59,15 @@
 							<ul id="industryList" class="clearfix"></ul>
 						</div>
 					</div>
-					<div class="search-criteria row" id="industryChildrenBox">
+					<div class="search-criteria row">
 						<div class="search-title col-md-1">
 							<span>技术类型</span>
 						</div>
 						<div class="search-select col-md-11">
-							<ul>
+							<ul id="selectAct">
 								<li class="active"><span>不限</span></li>
 								<li>
-									<label for="patent" class="patent">
+									<label for="patent" class="demand">
 										专利<input type="checkbox" name="fot" id="patent" value="0" />
 									</label>
 								</li>
@@ -100,26 +103,24 @@
 				<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>
+							<p><span>发布时间</span><img th:src="${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 class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</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>
+							<p><span>价格</span></p>							
+						</li>
+						<li>
+							<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"/>
+								<button>确定</button>
 							</div>
 						</li>
 					</ul>
@@ -127,139 +128,24 @@
 				<div class="head_right">
 					<div class="searchs">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+		 					搜一搜
 		 				</div> 				
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="医药生物"/>
 		 				</div>
-		 				<button></button>				
+		 				<button id="btn_search"></button>				
 		 			</div>
 		 			<ol>
 		 				<li>医药生物</li>
-		 				<li>医药生物</li>
-		 				<li>医药生物</li>
-		 				<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">

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

@@ -1,10 +1,11 @@
 <!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 + '/technologyTrading/demand.css'}" rel="stylesheet">
+<title>科技需求</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/technologyTrading/demand.css'}" rel="stylesheet">
 </head>
 <body>
 	<header>
@@ -13,39 +14,38 @@
 	<!--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>
+			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a src=""><img th:src="${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 class="btn btn-next" src="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
-		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		<a class="btn btn-pre" src="">
+			<img th:src="${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 class="achievement_top"><img th:src="${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"/>
+  					<p>教育休闲</p>
+  					<img th:src="${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'}"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
+  				<div class="text_replace">
+  					<img th:src="${portalHost + '/img/achievement_01_next.jpg'}" alt="" /><span></span>
+  				</div>
   			</ul>
   		</div>
   		<div class="wrap active">
@@ -63,7 +63,7 @@
 						<div class="search-title col-md-1">
 							<span>技术类型</span>
 						</div>
-						<div class="search-select col-md-8">
+						<div class="search-select col-md-11">
 							<ul id="technologyModeList" class="clearfix">
 								<li value="999" class="active"><span>不限</span></li>
 								<li value="0"><span>技术购买型需求</span></li>
@@ -85,26 +85,24 @@
 				<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>
+							<p><span>发布时间</span><img th:src="${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 class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</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>
+							<p><span>价格</span></p>							
+						</li>
+						<li>
+							<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"/>
+								<button>确定</button>
 							</div>
 						</li>
 					</ul>
@@ -112,14 +110,12 @@
 				<div class="head_right">
 					<div class="searchs">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+							搜一搜		 											
 		 				</div> 				
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="医药生物"/>
 		 				</div>
-		 				<button></button>				
+		 				<button id="btt_search"></button>				
 		 			</div>
 		 			<ol>
 		 				<li>医药生物</li>
@@ -131,126 +127,7 @@
 			</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">
@@ -278,8 +155,8 @@
 		<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>
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/technologyTrading/demand.js'}"></script>
 	</div>
 </body>
 </html>

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

@@ -14,31 +14,31 @@
 	<!--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>
+			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
+			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
+			<li data-index=4 ><a src=""><img th:src="${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=""/>
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
 		</a>
 	</div>
 	<!--主体内容区域开始-->
 	<div class="container ">
 		<div class="row zizone">
 			<div class="col-md-6 zone_left actives">
-				<img th:href="${portalHost + '/img/think_blur1.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_blur1.png'}" alt="" />
 				<div class="img_right">
 					<h4>智政</h4>
 					<p>您身边为您出谋划策的智者</p>
 				</div>
 			</div>
 			<div class="col-md-6  zone_right">
-				<img th:href="${portalHost + '/img/think_bai1.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_bai1.png'}" alt="" />
 				<div class="img_right">
 					<h4>智者</h4>
 					<p>您身边为您出谋划策的智者</p>
@@ -48,14 +48,14 @@
 		<!--搜索-->
 		<div class="zizone_search">
 			<div class="search_left">
-				<img th:href="${portalHost + '/img/think_03.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_03.png'}" alt="" />
 				<div class="img_txt">
 					<h4>海量专家</h4>
 					<p>严选超过8千位行家专属服务</p>
 				</div>
 			</div>
 			<div class="search_left">
-				<img th:href="${portalHost + '/img/think_05.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_05.png'}" alt="" />
 				<div class="img_txt">
 					<h4>按需顾问</h4>
 					<p>严选超过8千位行家专属服务</p>

+ 184 - 0
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>智政</title>
+	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">
+</head>
+
+<body>
+	<header>
+		<div th:replace="common::nav('thinkTank','policyList')"></div>
+	</header>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></li>
+			<li data-index=1 ><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></li>
+			<li data-index=2 ><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></li>
+			<li data-index=3 ><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></li>
+			<li data-index=4 ><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+    <div class="main_top">
+    	<div class="head_bj">
+	    	<div class="container">    		           
+	            <ul class="detail_toptitle">
+	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
+	            	<li>></li> 
+	                <li><a href="#">智库咨询</a></li>
+	                <li>></li>               
+	                <li><a href="#">智政</a></li>
+	                <li>></li>
+	                <li class="that"><a href="#" >智政资讯 </a></li>
+	            </ul>
+	            <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="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<div id="search_on">					
+		 					<input type="search" placeholder="高新"/>
+		 				</div>
+		 				<button id="btn_search"></button>						 			
+			 		</div>
+			 	</div>
+			</div>	       
+	    </div>	   
+        <div class="invest_midt  container">       		
+       		<div class="invest_contant">
+       			<div class="invest_left">       					 				
+		 			<div class="policy">
+	 				    <ul>
+		 					<li value="">
+		 						<div class="policy_time">
+		 							<p>30</p>
+		 							<time>2017-09</time>
+		 						</div>
+		 						<div class="policy_details">
+		 							<h4><a href="#">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
+			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
+			 						<a href="#">MORE+</a>
+		 						</div>
+		 					</li>
+		 					<li value="">
+		 						<div class="policy_time">
+		 							<p>30</p>
+		 							<time>2017-09</time>
+		 						</div>
+		 						<div class="policy_details">
+		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
+			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
+			 						<a href="#">MORE+</a>
+		 						</div>
+		 					</li>
+		 					<li value="">
+		 						<div class="policy_time">
+		 							<p>30</p>
+		 							<time>2017-09</time>
+		 						</div>
+		 						<div class="policy_details">
+		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
+			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
+			 						<a href="#">MORE+</a>
+		 						</div>
+		 					</li>
+		 					<li value="">
+		 						<div class="policy_time">
+		 							<p>30</p>
+		 							<time>2017-09</time>
+		 						</div>
+		 						<div class="policy_details">
+		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
+			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
+			 						<a href="#">MORE+</a>
+		 						</div>
+		 					</li>
+	 					</ul>	 				
+	 				</div>		
+       				<div class="pagination_box">
+						<nav aria-label="Page navigation" class="clearfix">							
+							<ul class="pagination">								
+								<li class="pagePre">
+									<a href="#" aria-label="Previous">
+										<span aria-hidden="true" value="1">首页</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">末页</span>
+									</a>
+								</li>							
+							</ul>
+							<span class="totalCount">共 0 页 0 条数据</span>
+						</nav>
+					</div>
+       			</div>
+       			<div class="invest_right">
+       				<h5>热点资讯</h5>
+       				<ul>
+       					<li>
+       						<a href="">
+	       						<p>高新是什家纺的的大学城赴会而</p>
+	       						<time>2017-09-18</time>
+       						</a>
+       					</li> 
+       					<li>
+       						<a href="">
+	       						<p>高新是什家纺的的大学城赴会而</p>
+	       						<time>2017-09-18</time>
+       						</a>
+       					</li>
+       					<li>
+       						<a href="">
+	       						<p>高新是什家纺的的大学城赴会而</p>
+	       						<time>2017-09-18</time>
+       						</a>
+       					</li>
+       					<li>
+       						<a href="">
+	       						<p>高新是什家纺的的大学城赴会而</p>
+	       						<time>2017-09-18</time>
+       						</a>
+       					</li>
+       					<li>
+       						<a href="">
+	       						<p>高新是什家纺的的大学城赴会而</p>
+	       						<time>2017-09-18</time>
+       						</a>
+       					</li>
+       				</ul>
+       			</div> 
+       		</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 + '/thinkTank/policyList.js'}"></script>
+	</div>
+</body>
+</html>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -8,7 +8,7 @@
 </head>
 <body>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('','')"></div>
 	</header>
 	<!--主体内容区域开始-->
   	  	<!--主体内容区域开始-->