浏览代码

品类重名限制,法律顾问列表页文字修改,法律顾问页面关注新增,缓存css\js

limin 7 年之前
父节点
当前提交
7004a87f76
共有 50 个文件被更改,包括 124 次插入16 次删除
  1. 1 0
      src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java
  2. 5 0
      src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java
  3. 2 0
      src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java
  4. 36 1
      src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml
  5. 1 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  6. 2 0
      src/main/webapp/WEB-INF/views/portal/aboutUs.html
  7. 2 0
      src/main/webapp/WEB-INF/views/portal/adviser.html
  8. 2 0
      src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html
  9. 2 0
      src/main/webapp/WEB-INF/views/portal/adviser/adviserList.html
  10. 1 1
      src/main/webapp/WEB-INF/views/portal/companyProfile.html
  11. 2 0
      src/main/webapp/WEB-INF/views/portal/contactUs.html
  12. 1 1
      src/main/webapp/WEB-INF/views/portal/continueHigh.html
  13. 2 0
      src/main/webapp/WEB-INF/views/portal/evaluation/evaluate.html
  14. 2 0
      src/main/webapp/WEB-INF/views/portal/evaluation/index.html
  15. 2 0
      src/main/webapp/WEB-INF/views/portal/facilitator.html
  16. 2 0
      src/main/webapp/WEB-INF/views/portal/index.html
  17. 2 0
      src/main/webapp/WEB-INF/views/portal/member.html
  18. 2 0
      src/main/webapp/WEB-INF/views/portal/membership.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/militaryProject.html
  20. 2 0
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  21. 2 0
      src/main/webapp/WEB-INF/views/portal/news/newsDetailApp.html
  22. 1 1
      src/main/webapp/WEB-INF/views/portal/practicalPatent.html
  23. 2 0
      src/main/webapp/WEB-INF/views/portal/search.html
  24. 2 0
      src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html
  25. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patent.html
  26. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patentList.html
  27. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patenteDetails.html
  28. 2 0
      src/main/webapp/WEB-INF/views/portal/service/projectDetails.html
  29. 2 0
      src/main/webapp/WEB-INF/views/portal/service/propertyRight.html
  30. 2 0
      src/main/webapp/WEB-INF/views/portal/service/purpose.html
  31. 2 0
      src/main/webapp/WEB-INF/views/portal/service/safeguarding.html
  32. 3 0
      src/main/webapp/WEB-INF/views/portal/service/safeguardingDetail.html
  33. 3 1
      src/main/webapp/WEB-INF/views/portal/service/safeguardingList.html
  34. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
  35. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  36. 2 0
      src/main/webapp/WEB-INF/views/portal/service/serviceIndexOld.html
  37. 2 0
      src/main/webapp/WEB-INF/views/portal/service/serviceList.html
  38. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  39. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  40. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html
  41. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html
  42. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  43. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  44. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html
  45. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html
  46. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  47. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html
  48. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html
  49. 2 0
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  50. 2 0
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

+ 1 - 0
src/main/java/com/goafanti/business/controller/AdminJtBusinessController.java

@@ -76,6 +76,7 @@ public class AdminJtBusinessController extends CertifyApiController{
 		int rc=jtBusinessService.insertCategory(jtBusinessCategory);
 		if(rc==-1)result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","每层品类不可超过99个,"));
 		if(rc==-2)result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","父类Id与层数需要对应,"));
+		if(rc==-3)result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","该品类已经存在,"));
 		return result;
 	}
 	

+ 5 - 0
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.poi.poifs.property.Child;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@ import com.goafanti.common.enums.ProjectAuditStatus;
 import com.goafanti.common.enums.UserAuthentication;
 import com.goafanti.common.enums.collectType;
 import com.goafanti.common.model.JtBusinessCategory;
+import com.goafanti.common.model.JtBusinessCategoryExample;
 import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.common.model.JtCollectSearch;
 import com.goafanti.common.model.JtTag;
@@ -159,6 +161,9 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		// TODO Auto-generated method stub
 //		jtBusinessCategoryMapper.autoIncreaseSort(jtBusinessCategory.getLayer(),jtBusinessCategory.getSort()); 
 		if(jtBusinessCategory.getSuperId()!=null && jtBusinessCategory.getLayer().intValue()==1 && jtBusinessCategory.getSuperId().length()>0)return -2;
+		//查看是否重名
+		int n = jtBusinessCategoryMapper.getCountBySome(jtBusinessCategory);
+		if(n>0)return -3;
 		//String number="BC";
 		String number=BusinessCategoryModule.getStatus(jtBusinessCategory.getModule()).toString();
 		if(jtBusinessCategory.getLayer().intValue()==2) {

+ 2 - 0
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -103,5 +103,7 @@ public interface JtBusinessCategoryMapper {
 	List<JtBusinessCategory> getCategoryByModel(JtBusinessCategory category);
 
 	List<JtBusinessCategoryBo> getHomeIndex(Integer module, Integer isHome);
+	
+	int getCountBySome(JtBusinessCategory category);
     
 }

+ 36 - 1
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -629,6 +629,41 @@ and layer=#{0}
     and home_index=#{1}
     order by sort
   </select>
-  
+  <!-- 按品类名称层级计数 -->
+  <select id="getCountBySome" resultType="java.lang.Integer" parameterType="com.goafanti.common.model.JtBusinessCategory">
+  	select count(0) from jt_business_category
+  	where 1=1
+  	<if test="name != null">
+      and name = #{name,jdbcType=VARCHAR}
+    </if>
+    <if test="summary != null">
+     and summary = #{summary,jdbcType=VARCHAR}
+    </if>
+    <if test="number != null">
+     and number = #{number,jdbcType=VARCHAR}
+    </if>
+    
+    <if test="superId != null">
+     and super_id = #{superId,jdbcType=VARCHAR}
+    </if>
+    <if test="imgUrl != null">
+     and img_url = #{imgUrl,jdbcType=VARCHAR}
+    </if>
+    <if test="layer != null">
+     and layer = #{layer,jdbcType=INTEGER}
+    </if>
+    <if test="sort != null">
+     and sort = #{sort,jdbcType=INTEGER}
+    </if>
+    <if test="pcIndex != null">
+     and pc_index = #{pcIndex,jdbcType=INTEGER}
+    </if>
+    <if test="appIndex != null">
+     and app_index = #{appIndex,jdbcType=INTEGER}
+    </if>
+    <if test="homeIndex != null">
+     and home_index = #{homeIndex,jdbcType=INTEGER}
+    </if>
+  </select>
   
 </mapper>

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

@@ -1248,7 +1248,7 @@ order by
   
   <select id="listInterestedExpert" resultType="com.goafanti.user.bo.UserIdentityBo">
 	 	select 	t.id ,t.uid,u.nickname as username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,t.industry,t.city,
-		u.type,u.introduction,t.expert,u.head_portrait_url as headPortraitUrl
+		u.type,u.introduction,t.expert,u.head_portrait_url as headPortraitUrl, t.consultant_type as consultantType
 		from user_identity t left JOIN user u on t.uid = u.id
 		left join user_interest ui on ui.to_uid=u.id
 		where ui.from_uid=#{uid,jdbcType=VARCHAR}

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/aboutUs.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>技淘--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/aboutUs.css'}" rel="stylesheet">
 </head>
@@ -285,6 +286,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/aboutUs.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/adviser.html

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>知识产权顾问首页</title>
+<link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/newMenu/adviser.css'}" rel="stylesheet"></head>
 <body>
@@ -57,6 +58,7 @@
 		<div th:replace="common::login"></div>
     </footer>
     <div th:replace="common::footer(~{::script})">
+    	<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
     	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/adviser.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/adviser/adviserDetail.html

@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>知识产权顾问详情</title>
+    <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost+'/newMenu/adviserDetail.css'}" rel="stylesheet"></head>
 
@@ -98,6 +99,7 @@
 		<div th:replace="common::login"></div>
     </footer>
     <div th:replace="common::footer(~{::script})">
+    	<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
     	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/adviserDetail.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/adviser/adviserList.html

@@ -8,6 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>知识产权顾问</title>
   
+<link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/newMenu/adviserList.css'}" rel="stylesheet"></head>
 <body>
@@ -63,6 +64,7 @@
 		<div th:replace="common::login"></div>
     </footer>
     <div th:replace="common::footer(~{::script})">
+    	<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
     	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/adviserList.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>技淘--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">
 <!-- <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.0&services=true"></script> -->
@@ -228,6 +229,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/contactUs.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/evaluation/evaluate.html

@@ -6,6 +6,7 @@
 <head th:replace="common::header(~{::title},~{::link})">
 	<meta charset="utf-8" />
 	<title>高企自评</title>
+	<link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost+'/evaluation/evaluate.css'}" rel="stylesheet"></head>
 </head>
@@ -455,6 +456,7 @@
 		<div th:replace="common::login"></div>
     </footer>
     <div th:replace="common::footer(~{::script})">
+    	<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
     	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/evaluation/evaluate.js'}"></script>
 	</div>

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

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>无形资产评估 - 技淘网</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/evaluation/index.css'}"
 	rel="stylesheet">
@@ -227,6 +228,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"th:src="${portalHost + '/evaluation/index.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/facilitator.html

@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>服务商主页</title>
+    <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost+'/facilitator.css'}" rel="stylesheet"> 
 </head>
@@ -107,6 +108,7 @@
 		<div th:replace="common::login"></div>
     </footer>
      <div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/facilitator.js'}"></script>
 	</div>

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

@@ -12,6 +12,7 @@
 成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
 	  <link rel="icon" type="image/png" th:href="${portalHost+'/img/ico_logo.png'}" sizes="16x16">
 	<title>首页</title>
+<link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/index.css'}" rel="stylesheet"></head>
 <body>
@@ -264,6 +265,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/index.js'}"></script>
 	</div>

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

@@ -3,6 +3,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>科技服务</title>
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/member.css'}" rel="stylesheet">
 </head>
@@ -63,6 +64,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/member.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/membership.html

@@ -3,6 +3,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>用户会员申请</title>
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/membership.css'}" rel="stylesheet">
 </head>
@@ -47,6 +48,7 @@
 		<div th:replace="common::copyright"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/membership.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


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

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>新闻详情--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
 </head>
@@ -62,6 +63,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/thinkTank/policyDetail.js'}"></script>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetailApp.html

@@ -3,6 +3,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>新闻详情</title>
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/news/newsDetailApp.css'}" rel="stylesheet">
 </head>
@@ -17,6 +18,7 @@
 		</div>
 	</div>
 	<div th:replace="common::footer(~{::script})">	
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/news/newsDetailApp.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html


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

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>搜索页</title>
+    <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/search.css'}" rel="stylesheet"></head>
 	</head>
@@ -58,6 +59,7 @@
 		<div th:replace="common::login"></div>
     </footer>
     <div th:replace="common::footer(~{::script})">
+	    <script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 	    <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/search.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>高企认定--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service/highTechCognizance.css'}" rel="stylesheet">
 </head>
@@ -283,6 +284,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/service/highTechCognizance.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patentList.html


文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patenteDetails.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/projectDetails.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 	    <title>项目详情</title>
+	     <link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
 	     <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 	    <link rel="stylesheet" th:href="${portalHost +'/service/projectDetails.css'}"/>
 	</head>
@@ -97,6 +98,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/service/projectDetails.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>知识产权--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service/propertyRight.css'}" rel="stylesheet">
 </head>
@@ -191,6 +192,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/service/propertyRight.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/purpose.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
     <title>服务意向</title>
+   <link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
    <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost +'/service/purpose.css'}" rel="stylesheet">
 </head>
@@ -61,6 +62,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/service/purpose.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/safeguarding.html

@@ -5,6 +5,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
     <title>知识产权维权</title>
+    <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
     <link th:href="${portalHost+'/newMenu/safeguarding.css'}" rel="stylesheet"></head>
 <body>
@@ -87,6 +88,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/safeguarding.js'}"></script>
 	</div>

+ 3 - 0
src/main/webapp/WEB-INF/views/portal/service/safeguardingDetail.html

@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>知识产权顾问</title>
+	<link th:href="${portalHost+'/dll/dll.css'}"  rel="stylesheet">
 	<link th:href="${portalHost+'/vendors.css'}"  rel="stylesheet">
 	<link th:href="${portalHost+'/newMenu/safeguardingDetail.css'}"  rel="stylesheet">
 </head>
@@ -22,6 +23,7 @@
                     <div>
                         <img  th:src="${sd.personPortraitUrl} != null and  ${sd.personPortraitUrl} != '' ? ${avatarUploadHost+sd.personPortraitUrl}:${portalHost + '/img/newMenu/policyBanner.png'}" alt="">
                     </div>
+                    <p class="collectionN active"><span th:class="${sd.interested}==0?'heart':'heart active'" ></span><span class="nubCollect" th:text="${sd.countInterest}">4</span>次关注</p>
                     <!-- <p><img th:src="${portalHost + '/img/newMenu/safeAddress.png'}"  alt=""><span>湖南长沙</span></p> -->
                 </div>
                 <div class="portraitRight">
@@ -136,6 +138,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/safeguardingDetail.js'}"></script>
 	</div>

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

@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>维权列表</title>
+	<link th:href="${portalHost+'/dll/dll.css'}"  rel="stylesheet">
 	<link th:href="${portalHost+'/vendors.css'}"  rel="stylesheet">
 	<link th:href="${portalHost+'/newMenu/safeguardingList.css'}"  rel="stylesheet">
 </head>
@@ -27,7 +28,7 @@
             </div>
         </div>
         <div class="sort">
-            <a class="relTime active">发布时间</a><a class="colNumber">关注量</a>
+            <a class="relTime active">发布时间</a><a class="colNumber">好评率</a>
         </div>
         <div class="adviserList">
             <ul>
@@ -61,6 +62,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/safeguardingList.js'}"></script>
 	</div>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceIndexOld.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>科技服务--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service.css'}" rel="stylesheet">
 </head>
@@ -360,6 +361,7 @@
 	</footer>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/service.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -8,6 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>技术服务列表</title>
    
+<link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/newMenu/serviceList.css'}" rel="stylesheet"></head>
 
 <body>
@@ -96,6 +97,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/serviceList.js'}"></script>
 	</div>

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

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>科技成果</title>
+<link th:href="${portalHost+ '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+ '/newMenu/achievement.css'}" rel="stylesheet">
 </head>
@@ -339,6 +340,7 @@
 		<div th:replace="common::login"></div>
     </footer>
    	<div th:replace="common::footer(~{::script})">
+   		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
    		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/achievement.js'}"></script>
 	</div>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>科技成果详情--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/achievementDetail.css'}" rel="stylesheet">
 </head>
@@ -226,6 +227,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading/achievementDetail.js'}"></script>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>订单页--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link
 	th:href="${portalHost + '/technologyTrading/achievementOrder.css'}"
@@ -127,6 +128,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading/achievementOrder.js'}"></script>

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

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>科技需求</title>
+<link th:href="${portalHost+ '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/newMenu/demand.css'}" rel="stylesheet">
 </head>
@@ -460,6 +461,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/demand.js'}"></script>
 	</div>

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

@@ -5,6 +5,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 <title >科技需求详情--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demandDetail.css'}" rel="stylesheet">
 </head>
@@ -211,6 +212,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading/demandDetail.js'}"></script>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html

@@ -4,6 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
 <title>订单页--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link
 	th:href="${portalHost + '/technologyTrading/demandOrder.css'}"
@@ -142,6 +143,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading/demandOrder.js'}"></script>

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

@@ -5,6 +5,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 <title>技术交易--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading.css'}"
 	rel="stylesheet">
@@ -274,6 +275,7 @@
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading.js'}"></script>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html


文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html


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

@@ -3,6 +3,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>智库咨询--我的技术和科技服务交易平台</title>
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
 </head>
@@ -161,6 +162,7 @@
 		<div th:replace="common::login"></div>	
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/thinkTank.js'}"></script>
 	</div>

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

@@ -3,6 +3,7 @@
 
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>智政--我的技术和科技服务交易平台</title>
+	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">
 </head>
@@ -94,6 +95,7 @@
 		<div th:replace="common::login"></div>	
 	</footer>
 	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/thinkTank/policyList.js'}"></script>
 	</div>