Просмотр исходного кода

多页面头部选中标识JS去除

anderx лет назад: 2
Родитель
Сommit
8d72133d85
22 измененных файлов с 139 добавлено и 147 удалено
  1. 3 3
      src/main/resources/props/config_local.properties
  2. 1 1
      src/main/webapp/WEB-INF/views/portal/continueHigh.html
  3. 10 10
      src/main/webapp/WEB-INF/views/portal/evaluation/evaluate.html
  4. 1 1
      src/main/webapp/WEB-INF/views/portal/militaryProject.html
  5. 1 1
      src/main/webapp/WEB-INF/views/portal/practicalPatent.html
  6. 3 3
      src/main/webapp/WEB-INF/views/portal/service/brandBuild.html
  7. 4 4
      src/main/webapp/WEB-INF/views/portal/service/governmentSupport.html
  8. 4 4
      src/main/webapp/WEB-INF/views/portal/service/marketOpen.html
  9. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patentList.html
  10. 1 1
      src/main/webapp/WEB-INF/views/portal/service/patenteDetails.html
  11. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
  12. 9 9
      src/main/webapp/WEB-INF/views/portal/service/serviceIndexOld.html
  13. 9 11
      src/main/webapp/WEB-INF/views/portal/service/serviceList.html
  14. 2 2
      src/main/webapp/WEB-INF/views/portal/service/taxFinance.html
  15. 21 21
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  16. 20 23
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html
  19. 29 29
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  20. 13 16
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  21. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html
  22. 3 3
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html

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

@@ -39,8 +39,8 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.11
-#portal.host=//ss.jishutao.com/portal/1.2.17
-portal.host=//statics.jishutao.com/portal/1.2.20
+#portal.host=//ss.jishutao.com/portal/1.2.20
+#portal.host=//statics.jishutao.com/portal/1.2.20
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
@@ -48,7 +48,7 @@ skjt.host=//ss.jishutao.com/skjt/1.3
 #static.host=//172.16.1.187/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
 #portal.host=//172.16.0.255:3000/jitao/portal/1.2.18
-#portal.host=//172.16.1.187/portal/1.2.11
+portal.host=//172.16.1.187/portal/1.2.20
 
 #avatar.host=//ss.jishutao.com
 #avatar.upload.host=//ss.jishutao.com/upload

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


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

@@ -12,7 +12,7 @@
 </head>
 
 <body>
-	<div th:replace="common::nav('','evaluate')"></div>
+	<div th:replace="common::nav('','serviceIndex')"></div>
 	<div id="myCarousel" class="carousel">
 		<!-- 轮播(Carousel)项目 -->
 		<div class="carousel-inner">
@@ -22,7 +22,7 @@
 		</div>
 	</div>
 
-	
+
 	<div class="container basic_info">
 		<div class="title">
 			<h1>免费诊断</h1>
@@ -50,7 +50,7 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label">注册时间 <span class="red">*</span></label>
 							<div class="col-sm-7 posi">
-								<input id="registDate" class="form-control dateTime" type="text" placeholder="请选择日期"/> 
+								<input id="registDate" class="form-control dateTime" type="text" placeholder="请选择日期"/>
 							</div>
 						</div>
 						<div class="form-group">
@@ -104,7 +104,7 @@
 								<input type="text" class="form-control" id="numberTechnician">
 							</div>
 						</div>
-	
+
 						<div class="form-group">
 							<div class="col-sm-offset-2 col-sm-7">
 								<button class="btn btn-default nextBtn" value="1">下一步</button>
@@ -184,7 +184,7 @@
 											<input type="text" class="form-control">
 										</div>
 									</div>
-	
+
 									<div class="form-group ipr_title">
 										<label class="col-sm-2 control-label"></label>
 										<div class="col-sm-7">
@@ -367,7 +367,7 @@
 						<label class="checkbox-inline">
 								<input type="radio" name="auxiliary" value="option4"> D、都不满足
 							</label>
-	
+
 						<div class="checkbox">
 							<label><input type="checkbox" disabled="disabled" value="">是否设立研发机构、是否开展产学研合作:</label>
 						</div>
@@ -380,7 +380,7 @@
 						<label class="checkbox-inline">
 								<input type="radio" name="cooperation" value="option3"> C、无研发机构无产学研合作
 							</label>
-	
+
 						<div class="checkbox">
 							<label><input type="checkbox" disabled="disabled" value="">是否建立了科技成果转化的组织实施与激励奖励制度,建立开放式的创新创业平台:</label>
 						</div>
@@ -401,7 +401,7 @@
 									</label>
 							</div>
 						</div>
-	
+
 						<div class="checkbox">
 							<label><input type="checkbox" disabled="disabled" value="">是否建立了科技人员的培养进修、职工技能培训、优秀人才引进,以及人才绩效评价奖励制度:</label>
 						</div>
@@ -417,7 +417,7 @@
 									</label>
 							</div>
 						</div>
-	
+
 						<div class="form-group">
 							<div class="col-sm-7">
 								<button type="" class="btn btn-default nextBtn" id="submit">提交</button>
@@ -462,4 +462,4 @@
 	</div>
 </body>
 
-</html>
+</html>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html


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

@@ -12,7 +12,7 @@
 <link th:href="${portalHost + '/newMenu/brandBuild.css'}" rel="stylesheet">
 <body>
 	<header>
-		<div th:replace="common::nav('service','')"></div>
+		<div th:replace="common::nav('service','serviceIndex')"></div>
 	</header>
 
     <!-- 公共头部结束 -->
@@ -45,7 +45,7 @@
                     <img th:src="${l.maxImgUrl}==null or ${l.maxImgUrl} == ''?${portalHost+'/img/load/brandBuild_3.png'}:${avatarUploadHost+l.maxImgUrl}" alt="">
                 </a>
             </li>
-            
+
         </ul>
         <img th:src="${portalHost+'/img/load/brandBuild_3.png'}"  alt="" class="brandImg2">
     </div>
@@ -90,4 +90,4 @@
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/brandBuild.js'}"></script>
 	</div>
 </body>
-</html>
+</html>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/service/governmentSupport.html

@@ -12,9 +12,9 @@
 <link th:href="${portalHost + '/newMenu/governmentSupport.css'}" rel="stylesheet">
 <body>
    <header>
-		<div th:replace="common::nav('service','')"></div>
+		<div th:replace="common::nav('service','serviceIndex')"></div>
 	</header>
-   
+
     <!-- 公共头部结束 -->
     <div class="continueHighBanner">
         <img th:src="${portalHost+'/img/load/governmentSupport_1.jpg'}" alt="">
@@ -92,7 +92,7 @@
                 <span></span>
                 <p>宿州市某农业机械有限公司,主营农具制造</p>
                 <p>1、公司成立2012年;</p>
-                <p>2、年营收360万元;</p>   
+                <p>2、年营收360万元;</p>
                 <p>3、申报政府科技项目;</p>
                 <p>4、于2017年6月获安徽省科技重大专项补贴320万元。</p>
             </div>
@@ -125,4 +125,4 @@
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/governmentSupport.js'}"></script>
 	</div>
 	</body>
-</html>
+</html>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/service/marketOpen.html

@@ -13,7 +13,7 @@
 
 <body>
 	<header>
-		<div th:replace="common::nav('service','')"></div>
+		<div th:replace="common::nav('service','serviceIndex')"></div>
 	</header>
     <!-- 公共头部结束 -->
     <div class="continueHighBanner">
@@ -25,7 +25,7 @@
             <p>企业开拓海外市场的过程中知识产权风险无处不在,因此从一开始树立知识产权风险防范和国际保护的意识非常重要,知识产权意识薄弱,致使我国企业在海外屡遭专利钳制。</p>
         </div>
         <div class="marketInternational">
-            <div th:each="l1:${list1}">	
+            <div th:each="l1:${list1}">
                 <a th:href="@{/portal/service/patentDetail(id=${l1.id})}">
 	                <div>
 	                    <p th:text="${l1.name}">PCT专利</p>
@@ -33,7 +33,7 @@
 	                </div>
                 </a>
             </div>
-            <!-- <div>	
+            <!-- <div>
                 <a th:href="@{/portal/service/patentDetail(id=891cf7c6-5a03-4887-a8fc-1e77c867e528)}">
 	                <div>
 	                    <p>PCT专利</p>
@@ -142,4 +142,4 @@
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/marketOpen.js'}"></script>
 	</div>
 </body>
-</html>
+</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


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


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

@@ -11,7 +11,7 @@
 
 <body>
 	<header>
-		<div th:replace="common::nav('service','')"></div>
+		<div th:replace="common::nav('service','serviceIndex')"></div>
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
@@ -48,7 +48,7 @@
 					</div>
 					<div>
 						<span>
-						
+
 							<img th:src="${portalHost+'/img/tech_tr.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_trbs.png'}" alt=""/>
 						</span>
@@ -96,8 +96,8 @@
 				</div>
 			</div>
 		</div>
-  	</div>  
-  	
+  	</div>
+
   	<!--知识产权-->
   	<div class="Intellectual">
   		<div class="container">
@@ -127,7 +127,7 @@
   					<p>知识产权贯标</p>
   					<p>政府倡导</p>
   					<a th:href="${basePath+'/portal/thinkTank/policyList.html'}">了解政策</a>
-  				</li>  				
+  				</li>
   			</ul>
   			<a onclick="_MEIQIA('showPanel')">立即咨询</a>
   		</div>
@@ -253,7 +253,7 @@
 	  				<p title='中铁十六局集团铁运工程有限公司'>中铁十六局集团铁运工程有限公司</p>
 	  			</li>
 	  		</ul>
-			
+
 			<ol class="customer_circle">
 				<li class="thonli"></li>
 				<li></li>
@@ -280,7 +280,7 @@
   	<div class="cooperation">
   		<div class="container">
   			<h4>合作服务机构</h4>
-  			<ol class="work_office"> 				
+  			<ol class="work_office">
   				<li class="bursar">会计事务所</li>
   				<li class="lawyer">律师事务所</li>
   			</ol>
@@ -353,7 +353,7 @@
 				</li> -->
 			</ul>
   		</div>
-  	</div>	
+  	</div>
   	<div class="img_city"></div>
 	<footer>
 		<div th:replace="common::copyright"></div>
@@ -367,4 +367,4 @@
 	</div>
 </body>
 
-</html>
+</html>

+ 9 - 11
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -7,37 +7,36 @@
     <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/serviceList.css'}" rel="stylesheet"></head>
 
 <body>
 
-		<div th:replace="common::nav('','')"></div>
-  
+
     <div class="container">
         <div class="industry">
             <p>业务分类</p>
             <div class="industryList">
                 <ul>
-                  
+
                 </ul>
             </div>
         </div>
         <div class="productionType">
             <p>业务项目</p>
             <ol>
-              
+
             </ol>
         </div>
         <div class="onSelect">
             <p>已选类型 </p>
             <ol>
                 <li class="preFirst">
-                   
+
                 </li>
                 <li class="next">
-                   
+
                 </li>
             </ol>
         </div>
@@ -57,7 +56,7 @@
                     <input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
                     <span class="input-group-btn">
                         <button class="btn btn-default searchBtn" type="button">
-                            <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 
+                            <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt="">
                         </button>
                     </span>
                 </div>
@@ -66,7 +65,7 @@
         <div class="achievementList">
             <div class="achievementHot">
                 <ul class="hotList">
-                   
+
                 </ul>
                 <div class="pagination_box">
                     <nav aria-label="Page navigation" class="clearfix">
@@ -100,9 +99,8 @@
 		<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>
-		<script> document.querySelectorAll(".nav>ul>li")[2].className="active" </script>
 	</div>
 </body>
 
 
-</html>
+</html>

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

@@ -12,7 +12,7 @@
 <link th:href="${portalHost + '/newMenu/taxFinance.css'}" rel="stylesheet">
 <body>
 	<header>
-		<div th:replace="common::nav('service','')"></div>
+		<div th:replace="common::nav('service','apply')"></div>
 	</header>
     <!-- 公共头部结束 -->
     <div class="continueHighBanner">
@@ -57,4 +57,4 @@
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/taxFinance.js'}"></script>
 	</div>
 </body>
-</html>
+</html>

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

@@ -10,10 +10,10 @@
 </head>
 
 <body>
-   <div th:replace="common::nav('','')"></div>
+   <div th:replace="common::nav('','trading')"></div>
     <!-- search -->
     <div class="container">
-        
+
         <div class="clearFix search">
             <div class="navMeau">
                 <div>
@@ -21,10 +21,10 @@
                     <div class="menuList">
                         <ul>
                             <li th:each="industry:${industryList}" >
-                            
+
                             <a th:href="@{/portal/technologyTrading/achievementList(fieldA=${industry.id})}" th:text="${industry.name}"></a>
                             </li>
-                         
+
                         </ul>
                     </div>
                 </div>
@@ -35,12 +35,12 @@
                         <input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
                         <span class="input-group-btn">
                             <button class="btn btn-default searchBtn" type="button">
-                                <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 
+                                <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt="">
                             </button>
                         </span>
                         <div class="txtVal"></div>
                     </div>
-                   
+
                 </div>
                 <div class="searchMain">
                     <ol>
@@ -133,11 +133,11 @@
                     <div>
                             <p th:text="${#strings.abbreviate(ra.name,15)}"></p>
                             <p><span class="orange" th:text="${ra.dataCategoryS}"></span>
-                            <span class="blur" th:text="${ra.releaseDate}==null?'未知时间':${#dates.format(ra.releaseDate,'yyyy-MM-dd')}"></span></p> 
+                            <span class="blur" th:text="${ra.releaseDate}==null?'未知时间':${#dates.format(ra.releaseDate,'yyyy-MM-dd')}"></span></p>
                         </div>
                         </a>
                 </li>
-              
+
             </ul>
             <a th:href="@{/portal/technologyTrading/achievementList}"> 查看更多 >></a>
         </div>
@@ -155,7 +155,7 @@
         <hr />
         <div class="achievementHot-list">
             <ul class="row">
-              
+
                 <li class="col-sm-4" th:each="hota:${hotAchievements}">
                   <a th:href="@{/portal/technologyTrading/achievementDetail(id=${hota.id},type=${hota.dataCategory})}">
                     <div>
@@ -167,7 +167,7 @@
                             <p>
                             <span class="follow">关注</span>
                             <span class="technology" th:text="${hota.categoryS}"></span></p>
-                            
+
                         </div>
                         </a>
                     </div>
@@ -185,7 +185,7 @@
 
             </div>
             <a th:href="@{/portal/technologyTrading/achievementList}">
-               
+
             </a>
         </div>
         <div class="patentList">
@@ -203,7 +203,7 @@
                 </div>
                 <div class="col-sm-8">
                     <ul class="row">
-                     
+
                         <li class="col-sm-4" th:each="pts:${patents}">
                           <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pts.id},type=${pts.dataCategory})}">
                             <div>
@@ -219,21 +219,21 @@
         <div class="achieveBj">
             <img th:src="${portalHost+'/img/newMenu/achievement_15.png'}" alt="">
         </div>
-       
+
         <div class="studyT" id="practicalTitle">
             <h4>实用技术
                 <a th:href="@{/portal/technologyTrading/achievementList}">查看更多 &gt; </a>
             </h4>
         </div>
         <div class="practical">
-        
+
             <div class="practicalLeft">
                 <ul>
-                    
+
                     <li th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}<5">
                       <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pt.id},type=${pt.dataCategory})}">
                         <div class="imgBj" >
-                            <img th:src="${pt.firstPicture}==null?${portalHost+'/img/initPic/achievementInit.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">   
+                            <img th:src="${pt.firstPicture}==null?${portalHost+'/img/initPic/achievementInit.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">
                             <span></span>
                         </div>
                         <div class="txts">
@@ -251,7 +251,7 @@
                 </ul>
                 <div class="practicalGrounp">
                     <ol>
-                      
+
                         <li  th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}>=5 and ${ptStat.index}<8">
                           <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pt.id},type=${pt.dataCategory})}">
                             <img th:src="${pt.firstPicture}==null?${portalHost+'/img/initPic/achievementInit.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">
@@ -273,7 +273,7 @@
                 </div>
             </div>
            <div class="practicalRight">
-                
+
             </div>
         </div>
         <div class="studyT" id="transactionTitle">
@@ -282,10 +282,10 @@
             </h4>
         </div>
         <div class="transaction">
-        
+
             <div class="transactionImg">
                 <img th:src="${portalHost+'/img/newMenu/achievement_29.jpg'}" alt="">
-                
+
                 <div th:each="policy,policyStat:${policyList}" th:if="${policyStat.index}==0">
                   <a th:href="@{/portal/news/newsDetail(id=${policy.id},type=0)}">
                     <address><img th:src="${portalHost+'/img/newMenu/achievement_28.jpg'}" alt="">
@@ -347,4 +347,4 @@
 
 </body>
 
-</html>
+</html>

+ 20 - 23
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -10,7 +10,7 @@
 </head>
 <body>
 
-		<div th:replace="common::nav('technologyTrading','achievement')"></div>
+		<div th:replace="common::nav('technologyTrading','trading')"></div>
 	<!--主体内容区域开始-->
 	<div id="all_achievement">
 		<div class="detail">
@@ -22,7 +22,7 @@
 						th:src="${portalHost + '/img/detail_weixin.jpg'}" alt="" /></a> <a
 						href="#"><img th:src="${portalHost + '/img/detail_weibo.jpg'}"
 						alt="" /></a>
-				</div>-->				
+				</div>-->
 				<div class="detail_toptitle" th:each="achievementdetail:${achievementdetail}" >
 					<a href="/portal/technologyTrading/achievement">技术成果&nbsp;&nbsp;></a> <a href="/portal/technologyTrading/achievementList">技术成果列表&nbsp;&nbsp;></a> <a href="#"
 						class="a_detail" th:text="${achievementdetail.name}">详情</a>
@@ -42,7 +42,7 @@
 						</div>
 						     <div class="collection">
              <p><span th:class="${isInterested}==null?'heart':'heart active'"></span><span>收藏</span></p>
-        </div>					
+        </div>
 					</div>
 					<div class="basic">
 						<div class="inline_span">
@@ -67,33 +67,33 @@
    							  <span>所属公司:</span> <span class="companyName" th:text="${achievementdetail.ownerName}==null?'佚名':${achievementdetail.ownerName}"></span>
 						</div>
 						<div class="inline_span1">
-							<span>最近更新</span><span th:text="${achievementdetail.releaseDate}?${#dates.format(achievementdetail.releaseDate,'yyyy-MM-dd')}:暂无该信息"></span>  
+							<span>最近更新</span><span th:text="${achievementdetail.releaseDate}?${#dates.format(achievementdetail.releaseDate,'yyyy-MM-dd')}:暂无该信息"></span>
 						</div>
-						<div class="loves">							
+						<div class="loves">
                        		<span class="box_love"></span><span class="dem_number" ></span><span>我感兴趣</span>
-							<input type="hidden" th:val="${achievementdetail.id}" id="demand_id">         
-												            
-							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">    
-						   					                 
+							<input type="hidden" th:val="${achievementdetail.id}" id="demand_id">
+
+							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">
+
                     	</div>
-	                    <div class="detail_btn">	
+	                    <div class="detail_btn">
 	                      <a onclick="openZoosUrl('chatwin');">
-	                      
+
 						<span class="glyphicon glyphicon-user"></span>
 						<span >在线咨询</span>
 					</a>
-	         
+
 	                        <input type="hidden" th:val="${achievementdetail.id}" id="Id_" />
-							<input type="hidden" id="number" value='1'>		
+							<input type="hidden" id="number" value='1'>
 							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
-							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>		
+							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>
 	                    </div>
 
 					</div>
 					<div class="fine">
 						<div class="fine_title">精品专利</div>
 						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer" >
-							
+
 							<div th:if="${reboutiqueachievement.firstPicture} == null " >
 								<img th:src="${portalHost+'/img/initPic/achievementInit.jpg'}" alt=""/>
 							</div>
@@ -103,11 +103,11 @@
 							<p th:text="${reboutiqueachievement.name}"></p>
 							<p class="demandId" th:text="${reboutiqueachievement.id}"></p>
 							<p class="demandTyp" th:text="${reboutiqueachievement.dataCategory}"></p>
-				
+
 						</div>
 					</div>
 				</div>
-				
+
 			</div>
 			<div class="publicComment">
                 <ol class="tabEvaluate">
@@ -133,7 +133,7 @@
 											<div th:if="${reachievementlist.firstPicture} != null " >
 												<img th:src="${avatarUploadHost+reachievementlist.firstPicture}" alt=""/>
 											</div>
-											
+
 											<div class="list_text">
 												<p class="likeId" th:text="${reachievementlist.id}"></p>
 											<p class="likeType" th:text="${reachievementlist.dataCategory}"></p>
@@ -143,7 +143,7 @@
 												<p >
 													名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
 												</p>
-											   
+
 												<p >
 													交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
 												</p>
@@ -152,7 +152,7 @@
 											<div class="star">
 												<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
 											</div>
-											
+
 										</li>
 									</ul>
 								</div>
@@ -230,9 +230,6 @@
 		<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>
-		<script> document.querySelectorAll(".nav>ul>li")[4].className="active"
-			  document.querySelectorAll(".tabEvaluate>li")[1].style.display = "none"
-		</script>
 	</div>
 </body>
 

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html


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

@@ -11,7 +11,7 @@
 	rel="stylesheet">
 </head>
 <body>
-		<div th:replace="common::nav('technologyTrading','achievement')"></div>
+		<div th:replace="common::nav('technologyTrading','trading')"></div>
 	<!--主体内容区域开始-->
 	<div id="all_achievement">
 		<div class="detail">

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

@@ -11,7 +11,7 @@
 
 <body>
 
-		<div th:replace="common::nav('','')"></div>
+		<div th:replace="common::nav('','trading')"></div>
 	<!-- search -->
 	<div class="container">
 		<div class="clearFix search">
@@ -36,12 +36,12 @@
 							placeholder="输入你感兴趣的内容"> <span class="input-group-btn">
 							<button class="btn btn-default searchBtn" type="button">
 								<img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}"
-									alt=""> 
+									alt="">
 							</button>
 						</span>
 						<div class="txtVal"></div>
 					</div>
-					
+
 				</div>
 				<div class="searchMain">
 					<ol>
@@ -132,9 +132,9 @@
 				<li th:each="recentDemandList:${recentDemandList}">
 				<a th:href="@{/portal/technologyTrading/demandDetail(id=${recentDemandList.id},type=${recentDemandList.dataCategory})}">
 					<div th:switch="${recentDemandList.demandType}">
-					
+
 						<p>
-						
+
 							<p th:text="${#strings.abbreviate(recentDemandList.name,10)}"></p>
 							<p class="colorWrite" th:text="${#strings.abbreviate(recentDemandList.problemDes,18)}"></p>
 							<p>
@@ -146,8 +146,8 @@
 								class="colorRed" th:case='5' th:text="技术人才需求"></span>
 											<span class="colorBlur timeBefor"
 							th:text="${recentDemandList.releaseDate}==null?'':${#dates.format(recentDemandList.releaseDate,'yyyy-MM-dd')}"></span></p>
-					
-			
+
+
 						</p>
 					</div>
 					</a>
@@ -178,16 +178,16 @@
 						<div>
 							<p th:switch="${u2.demandType}">
 								<span class="talents" th:case='0' th:text="企业技术需求"></span>
-								 <span class="talents" th:case='1' th:text="技术设备需求"></span> 
-								 <span class="talents" th:case='2' th:text="产学研合作需求"></span> 
-								 <span class="talents" th:case='3' th:text="研产资金需求"></span> 
+								 <span class="talents" th:case='1' th:text="技术设备需求"></span>
+								 <span class="talents" th:case='2' th:text="产学研合作需求"></span>
+								 <span class="talents" th:case='3' th:text="研产资金需求"></span>
 								 <span class="talents" th:case='4' th:text="地区产业需求"></span>
 								  <span class="talents" th:case='5' th:text="技术人才需求"></span>
 								  <span class="name" th:text="${u2.name}"></span>
 							</p>
-							
+
 							<p>
-								 <p class="problemDes" th:text="${u2.problemDes}"></p>	
+								 <p class="problemDes" th:text="${u2.problemDes}"></p>
 								 <span class="colorTime" th:if="${u2.validityPeriod}==null" th:text="无期限"></span>
 								 <span class="colorTime" th:if="${u2.validityPeriod}!=null" th:text="${#dates.format(u2.validityPeriod,'yyyy-MM-dd')+'到期'}"></span>
 								 <span class="colorOrange" th:if="${u2.demandType}==5" th:text="${u2.fundForPersonnel}==null?'人才:面议':${'人才:¥'+u2.fundForPersonnel+'万'}"></span>
@@ -209,20 +209,20 @@
 										class="talents" th:case='3' th:text="研产资金需求"></span> <span
 										class="talents" th:case='4' th:text="地区产业需求"></span> <span
 										class="talents" th:case='5' th:text="技术人才需求"></span>
-									<span th:text="${u3.name}"></span>	
+									<span th:text="${u3.name}"></span>
 										<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}==null">用途:未知</span>
 									<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}!=null" th:text="${u3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
 									<span class="colorOrange" th:if="${u3.demandType}==5" th:text="${u3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+u3.fundForPersonnel+'元/月'}"></span>
 									<span class="colorOrange" th:if="${u3.demandType}==3" th:text="${u3.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+u3.fundForCrowd+'万'}"></span>
 
 								</div>
-								
-							
+
+
 							</p>
 							<p class="introduceP">
 							 <span th:text="${u3.problemDes}"></span>
 							 <span class="colorTime" th:if="${u3.validityPeriod}!=null" th:text="${#dates.format(u3.validityPeriod,'yyyy-MM-dd')+'到期'}"></span>
-								
+
 							</p>
 							</a>
 						</li>
@@ -251,15 +251,15 @@
 						<p>
 							<div th:switch="${h2.demandType}">
 								<span class="talents" th:case='0' th:text="企业技术需求"></span>
-								 <span class="talents" th:case='1' th:text="技术设备需求"></span> 
-								 <span class="talents" th:case='2' th:text="产学研合作需求"></span> 
-								 <span class="talents" th:case='3' th:text="研产资金需求"></span> 
+								 <span class="talents" th:case='1' th:text="技术设备需求"></span>
+								 <span class="talents" th:case='2' th:text="产学研合作需求"></span>
+								 <span class="talents" th:case='3' th:text="研产资金需求"></span>
 								 <span class="talents" th:case='4' th:text="地区产业需求"></span>
 								  <span class="talents" th:case='5' th:text="技术人才需求"></span>
 								  <span class="name" th:text="${h2.name}"></span>
 							</p>
 							<p>
-								 <p class="problemDes" th:text="${h2.problemDes}"></p>	
+								 <p class="problemDes" th:text="${h2.problemDes}"></p>
 								 <span class="colorOrange" th:if="${h2.demandType}==5" th:text="${h2.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h2.fundForPersonnel}+'元/月'"></span>
 								 <span class="colorOrange" th:if="${h2.demandType}==3" th:text="${h2.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+h2.fundForCrowd}+'万'"></span>
 								<span class="colorTime">	<img th:src="${portalHost+'/img/newMenu/demand-5.jpg'}" alt=""></span>
@@ -267,7 +267,7 @@
 						</div>
 						</a>
 				</div>
-			
+
 			</div>
 				<div class="talentsTxt row">
 					<ol>
@@ -276,12 +276,12 @@
 							<p class="introduceP">
 								<div th:switch="${h3.demandType}">
 									<span class="talents" th:case='0' th:text="企业技术需求"></span>
-									 <span class="talents" th:case='1' th:text="技术设备需求"></span> 
+									 <span class="talents" th:case='1' th:text="技术设备需求"></span>
 									 <span class="talents" th:case='2' th:text="产学研合作需求"></span>
-									  <span class="talents" th:case='3' th:text="研产资金需求"></span> 
+									  <span class="talents" th:case='3' th:text="研产资金需求"></span>
 									  <span class="talents" th:case='4' th:text="地区产业需求"></span>
 									   <span class="talents" th:case='5' th:text="技术人才需求"></span>
-									<span th:text="${h3.name}"></span>	
+									<span th:text="${h3.name}"></span>
 							<span class="colorOrange" th:if="${h3.researchType}==null and ${h3.demandType}==3">用途:未知</span>
 									<span class="colorOrange" th:if="${h3.demandType}==3 and ${h3.researchType}!=null" th:text="${h3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
 											<span class="colorOrange" th:if="${h3.demandType}==5" th:text="${h3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h3.fundForPersonnel+'元/月'}"></span>
@@ -290,7 +290,7 @@
 							</p>
 							<p class="introduceP" >
 							 <span th:text="${h3.problemDes}"></span>
-			
+
 									<img th:src="${portalHost+'/img/newMenu/demand-5.jpg'}" alt="">
 							</p>
 							</a>
@@ -383,7 +383,7 @@
 						</div>
 						</a>
 					</li>
-				
+
 				</ul>
 			</div>
 			<div class="colSm2">
@@ -401,7 +401,7 @@
 <!-- 			</div> -->
 <!-- 			<div class="col-sm-10"> -->
 <!-- 				<ol class="row"> -->
-					
+
 <!-- 					<li class="col-sm-3" th:each="fundDemand:${fundDemandList}"> -->
 <!-- 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}"> -->
 <!-- 						<div class="capital-administration"> -->
@@ -436,7 +436,7 @@
 			</div>
 			<div class="colSm10">
 				<ol class="row">
-				
+
 					<li th:each="personnelDemand:${personnelDemandList}">
 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${personnelDemand.id},type=${personnelDemand.dataCategory})}">
 						<div>
@@ -466,4 +466,4 @@
 		<script type="text/javascript" th:src="${portalHost+'/newMenu/demand.js'}"></script>
 	</div>
 </body>
-</html>
+</html>

+ 13 - 16
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -11,13 +11,13 @@
 </head>
 
 <body>
-		<div th:replace="common::nav('','')"></div>
+		<div th:replace="common::nav('','trading')"></div>
 	<div id="all_achievement">
 		<div class="detail">
 			<div class="detail_top">
 				<div class="detail_toptitle" th:each="demand:${demand}">
-					<a href="/portal/technologyTrading/demand">技术需求&nbsp;&nbsp;></a> 
-					 <a href="/portal/technologyTrading/demandList">技术需求列表&nbsp;&nbsp;></a> 
+					<a href="/portal/technologyTrading/demand">技术需求&nbsp;&nbsp;></a>
+					 <a href="/portal/technologyTrading/demandList">技术需求列表&nbsp;&nbsp;></a>
 					 <a href="#"class="a_detail" th:text="${#strings.abbreviate(demand.name,11)}"></a>
 				</div>
 			</div>
@@ -54,24 +54,24 @@
 						<div class="inline_span">
 							<span>有效日期:</span> <span th:text="${demand.validityPeriod}?${#dates.format(demand.validityPeriod,'yyyy-MM-dd')}:永久"></span>
 						</div>
-						
+
 	                    <div class="detail_btn">
 	                      <a onclick="openZoosUrl('chatwin');">
 						<span class="glyphicon glyphicon-user"></span>
 						<span >在线咨询</span>
 					</a></a>
 	                        <input type="hidden" th:val="${demand.id}" id="Id_" />
-	                        <input type="hidden" id="number" value='1'>		
+	                        <input type="hidden" id="number" value='1'>
 							<input type="hidden" th:typ="${demand.dataCategory}" id="ownerType_" />
 							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
-							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>	
+							 <a class="shopCar"><span class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span>加入购物车</a>
 	                    </div>
- 
+
 					</div>
 					<div class="fine">
 						<div class="fine_title">热门需求</div>
 						<div th:each="reboutiquedemand:${reboutiquedemand}" class="pointer">
-							
+
 							<div th:if="${reboutiquedemand.firstPic} == null " >
 								<img th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt=""/>
 							</div>
@@ -84,7 +84,7 @@
 						</div>
 					</div>
 				</div>
-				
+
 			</div>
 			 <div class="publicComment">
                 <ol class="tabEvaluate">
@@ -103,14 +103,14 @@
 								<div class="line">猜你喜欢</div>
 								<div class="main_introduce">
 									<ul>
-										<li th:each="redemandlist:${redemandlist}"> 
+										<li th:each="redemandlist:${redemandlist}">
 											<div th:if="${redemandlist.firstPic} == null " >
 												<img th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt=""/>
 											</div>
 											<div th:if="${redemandlist.firstPic} != null" >
 												<img th:src="${avatarUploadHost+redemandlist.firstPic}" alt=""/>
 											</div>
-										 
+
 											<div class="list_text">
 												<p>
 													行业:<span th:text="${redemandlist.industryCategory1}?${redemandlist.industryCategory1}:暂无行业分类"></span>
@@ -204,7 +204,7 @@
                     </div>
                 </div>
             </div>
-			
+
 		</div>
 	</div>
 	<footer>
@@ -215,10 +215,7 @@
 		<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>
-		<script> document.querySelectorAll(".nav>ul>li")[4].className="active"
-			  document.querySelectorAll(".tabEvaluate>li")[1].style.display = "none"
-		</script>
 	</div>
 </body>
 
-</html>
+</html>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html


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

@@ -12,7 +12,7 @@
 </head>
 <body>
 	<header>
-		<div th:replace="common::nav('technologyTrading','achievement')"></div>
+		<div th:replace="common::nav('technologyTrading','trading')"></div>
 	</header>
 	<!--主体内容区域开始-->
 	<div id="all_achievement">
@@ -75,14 +75,14 @@
 				<div class="line">猜你喜欢</div>
 				<div class="main_introduce">
 					<ul>
-						<li th:each="redemandlist:${redemandlist}"> 
+						<li th:each="redemandlist:${redemandlist}">
 							<div th:if="${redemandlist.pictureUrl} == null " >
 								<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
 							</div>
 							<div th:if="${redemandlist.pictureUrl} != null" >
 								<img th:src="${avatarUploadHost+redemandlist.pictureUrl}" alt=""/>
 							</div>
-						 
+
 							<div class="list_text">
 								<p>
 									行业:<span th:text="${redemandlist.industryCategoryAS}?${redemandlist.industryCategoryAS}:暂无行业分类"></span>