Browse Source

交易默认图 成果数量修改

limin 7 years ago
parent
commit
f5bac2f499

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

@@ -1006,7 +1006,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("hotAchievements", hotAchievements);
 
 		// 专利
-		List<AchievementObject> patentAchievements = achievementService.getPatentList(9, url, showLocation);
+		List<AchievementObject> patentAchievements = achievementService.getPatentList(6, url, showLocation);
 		modelview.addObject("patents", patentAchievements);
 		// 实用技术
 		List<AchievementObject> practicalTechnology = achievementService.getPracticalTechnologys(8, url, showLocation);

+ 0 - 24
src/main/webapp/WEB-INF/views/common.html

@@ -245,30 +245,6 @@
                          <a th:href="@{/portal/service/safeguarding}">维权</a>
                         </div>
                      </li>                         
-<!--                     <li th:class="${subM}=='thindTankIndex'?active:''"> -->
-<!--                     <div> -->
-<!--                         <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a> -->
-<!--                         <ol class="subnavigation"> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/thinkTank/policyList}">智政</a> -->
-<!--                             </li> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/thinkTank/index.html#zizone}">智者</a> -->
-<!--                             </li> -->
-<!--                         </ol> -->
-<!--                         </div> -->
-<!--                     </li> -->
-
-<!--                     <li th:class="${subM}=='aboutUs'?active:''"> -->
-<!--                     <div> -->
-<!--                         <a th:href="@{/portal/aboutUs}">关于公司</a> -->
-<!--                         <ol class="subnavigation" style="display: none;"> -->
-<!--                             <li> -->
-<!--                                 <a th:href="@{/portal/contactUs}">联系我们</a> -->
-<!--                             </li> -->
-<!--                         </ol> -->
-<!--                         </div> -->
-<!--                     </li> -->
                 </ul>
             </div>
             <!-- <div class="logo_photo">全国统一服务热线:400-8800-962</div> -->

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

@@ -174,9 +174,9 @@
 			</div>
 			<div class="hotProject_cont" >
 				<div th:each="p,pStatus:${projects}">
-					<img th:src="${p.maxImgUrl}==null?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
+					<img th:src="${p.maxImgUrl}==null or ${p.maxImgUrl}==''?${portalHost+'/img/indedImg/inded11.png'}:${avatarUploadHost+p.maxImgUrl}" alt="">
 					<h3 th:text="${p.name}">高新认定</h3>
-					<p th:text="${p.advertisement}==null?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
+					<p th:text="${p.advertisement}==null or ${p.advertisement}==''?'暂无简介':${#strings.abbreviate(p.advertisement,30)}"></p>
 					<a th:href="@{/portal/service/serviceDetail(id=${p.id})}">立即办理</a>
 				</div>
 			</div>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


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

@@ -192,11 +192,11 @@
                 <div class="col-sm-4">
                         <div class="demandAdviser">
                         <img th:src="${portalHost+'/img/newMenu/achievement_10.png'}" alt="">
-                        <a onclick="_MEIQIA('showPanel')"></a>
+                        <a onclick="openZoosUrl('chatwin');"></a>
                     </div>
                     <div class="demandDeclare">
                         <img th:src="${portalHost+'/img/newMenu/achievement_11.png'}" alt="">
-                        <a onclick="_MEIQIA('showPanel')"></a>
+                        <a onclick="openZoosUrl('chatwin');"></a>
                     </div>
 
                 </div>

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

@@ -307,10 +307,10 @@
 				企业技术需求 <a th:href="@{/portal/technologyTrading/demandList}">查看更多 > </a>
 			</h4>
 			<div class="row">
-				<div class="col-md-2">
+				<div class="colMd2">
 					<img th:src="${portalHost+'/img/newMenu/demand-8.png'}" alt="">
 				</div>
-				<div class="imgGroup col-md-10">
+				<div class="imgGroup colMd10">
 					<ul>
 
 						<li th:each="companyDemandList:${companyDemandList}">
@@ -366,9 +366,9 @@
 			</h4>
 		</div>
 		<div class="row studyTxt">
-			<div class="col-sm-10">
+			<div class="colSm10">
 				<ul class="row">
-					<li class="col-sm-4" th:each="plsdemand:${proLearnStudyDemandList}">
+					<li th:each="plsdemand:${proLearnStudyDemandList}">
 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${plsdemand.id},type=${plsdemand.dataCategory})}">
 						<div class="imgLeft">
 							<img th:if="${plsdemand.pictureUrl}==null" th:src="${portalHost+'/img/initPic/demandInit.jpg'}" alt="">
@@ -385,7 +385,7 @@
 				
 				</ul>
 			</div>
-			<div class="col-sm-2">
+			<div class="colSm2">
 				<img th:src="${portalHost+'/img/newMenu/demand-18.jpg'}" alt="">
 			</div>
 		</div>
@@ -430,13 +430,13 @@
 			</h4>
 		</div>
 		<div class="technology row">
-			<div class="col-sm-2">
+			<div class="colSm2">
 				<img th:src="${portalHost+'/img/newMenu/demand-21.jpg'}" alt="">
 			</div>
-			<div class="col-sm-10">
+			<div class="colSm10">
 				<ol class="row">
 				
-					<li class="col-sm-4" th:each="personnelDemand:${personnelDemandList}">
+					<li th:each="personnelDemand:${personnelDemandList}">
 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${personnelDemand.id},type=${personnelDemand.dataCategory})}">
 						<div>
 							<h4 >