Forráskód Böngészése

Merge branch 'master' of jishutao/jitao-server into test

liliang4869 7 éve%!(EXTRA string=óta)
szülő
commit
1395f1a1d1

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

@@ -577,6 +577,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/index");
 	
 		List<JtBusinessCategoryBo> patentCategory=jtBusinessService.getCategoryBoList(1);
+		patentCategory=patentCategory.subList(0, Math.min(3, patentCategory.size()));
 		modelview.addObject("patentCategory",patentCategory);
 		List<JtBusinessProject> jtBusinessProjects=(List<JtBusinessProject>) jtBusinessService.getProjects(null, null, null, 5, 1, 1, 2, 0, 1,0,0,null).getList();
 		for(JtBusinessProject project:jtBusinessProjects) { 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


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

@@ -77,7 +77,9 @@
                     	</div>
 	                    <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_" />

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

@@ -57,6 +57,7 @@
 	                    <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'>		

+ 5 - 2
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -66,8 +66,11 @@
 			</a>
 		</div>
 		<div class="achieve_btn">
-			<a onclick="_MEIQIA('showPanel')">线下约见</a>
-<!-- 			<a id="consultBtn">在线咨询</a> -->
+			<a onclick="openZoosUrl('chatwin');">
+						<span class="glyphicon glyphicon-user"></span>
+								<span >在线咨询</span>
+					</a>
+	
 			<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
 		</div>
 	</div>