Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 7 years ago
parent
commit
4dcb881444

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

@@ -236,9 +236,9 @@ public class WebpageController extends BaseController {
 		List<BusinessProject> projectList=marketingManagementService.selectHotProject(5);
 		
 		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(request,
-				MarketingPage.specialist.getBoothType(),MarketingPage.mainAchievement.getBoothSize());
+				MarketingPage.mainAchievement.getBoothType(),MarketingPage.mainAchievement.getBoothSize());
 		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
-				MarketingPage.specialist.getBoothType(),MarketingPage.mainDemand.getBoothSize());
+				MarketingPage.mainDemand.getBoothType(),MarketingPage.mainDemand.getBoothSize());
 		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(request,
 				MarketingPage.specialist.getBoothType(), MarketingPage.specialist.getBoothSize());
 		modelview.addObject("achievementList", achievementList);

+ 3 - 3
src/main/java/com/goafanti/common/enums/MarketingPage.java

@@ -1,10 +1,10 @@
 package com.goafanti.common.enums;
 
 public enum MarketingPage {
-	mainAchievement("/index",1,9), //首页成果
-	mainDemand("/index",2,9),	// 首页需求
+	mainAchievement("/index",1,5), //首页成果
+	mainDemand("/index",2,8),	// 首页需求
 	mainPolicy("/index",6,3), //首页政策
-	specialist("/index",7,8);//智者专家
+	specialist("/index",7,6);//智者专家
 	MarketingPage(String pageUrl,Integer boothType,Integer boothSize){
 		this.boothSize = boothSize;
 		this.pageUrl = pageUrl;

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

@@ -263,7 +263,7 @@
 									<img th:src="${speciaList[4].headPortraitUrl}?${avatarUploadHost+speciaList[4].headPortraitUrl}:${avatarUploadHost+ '/default/person.jpg'}" alt=""   />
 									<h4 class="appellation" th:text="${speciaList[4].abilityLabel}">联网信息产品营销专家</h4>
 									<h3 class="definition" th:text="${speciaList[4].username}">安良煜</h3>
-									<p th:text="${speciaList[4].achievement}">从2003正式接触互联网至今拥有10多年的互联网信息产品营销实战经验。</p>
+									<p th:text="${speciaList[4]introduction}">从2003正式接触互联网至今拥有10多年的互联网信息产品营销实战经验。</p>
 								</div>
 							</a>	
 						</div>
@@ -273,7 +273,7 @@
 									<img th:src="${speciaList[5].headPortraitUrl}?${avatarUploadHost+speciaList[5].headPortraitUrl}:${avatarUploadHost+ '/default/person.jpg'}" alt=""   />
 									<h4 class="appellation" th:text="${speciaList[5].abilityLabel}">考古文博学院教授</h4>
 									<h3 class="definition" th:text="${speciaList[5].username}">齐方栋</h3>
-									<p th:text="${speciaList[5].achievement}">论著百余篇,主要包括吐谷浑余部历史的研究、三国至隋唐时期墓葬制度的研究、
+									<p th:text="${speciaList[5].introduction}">论著百余篇,主要包括吐谷浑余部历史的研究、三国至隋唐时期墓葬制度的研究、
 									中国古代金银器研究、古代马具的研究、古代玻璃器研究、丝绸之路考古研究。</p>
 								</div>
 							</a>