anderx лет назад: 3
Родитель
Сommit
6bf52db412

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

@@ -845,15 +845,9 @@ public class WebpageController extends BaseController {
 				.listNews(0, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
 		modelview.addObject("news", newsList);//资讯
 		//
-		List<News> subscriptions = (List<News>) newsService
-				.listNews(99, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
-		modelview.addObject("subscription", subscriptions);//技淘观点精选
-
-		if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
-				&& subscriptions.get(0).getSourceUrl().contains(".")) {
-			modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
-		}
-
+		List<News> encyclopedias = (List<News>) newsService
+				.listNews(98, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
+		modelview.addObject("encyclopedias", encyclopedias);//技淘观点精选
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
 		if(null != blist){
@@ -862,32 +856,7 @@ public class WebpageController extends BaseController {
 		//视频
 		String url = adminVideoService.getIndexVideo(1).getUrl();//首页
 		modelview.addObject("vurl", url);
-		// List<AchievementObject>
-		// achievementObjects=achievementService.getHotAchievements(9, url,
-		// "web_index");
-		// modelview.addObject("achievements",achievementObjects);
-		//
-		//
-		//
-		//
-		// List<DemandListBo> demandListBos=demandService.getHotDemand(9, url,
-		// "web_index");
-		// for(DemandListBo demandListBo:demandListBos) {
-		// if(demandListBo.getPictureUrl()==null ||
-		// !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
-		// else
-		// demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
-		// }
-		// //专家
-		// List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
-		// for(UserIdentityBo u:aExperts) {
-		// if(u.getHeadPortraitUrl()!=null &&
-		// u.getHeadPortraitUrl().length()<=0) {
-		// u.setHeadPortraitUrl(null);
-		// }
-		// }
-		// modelview.addObject("experts",aExperts);
-		// modelview.addObject("demands",demandListBos);
+
 
 		return modelview;
 	}
@@ -1641,7 +1610,6 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 新闻详情
-	 * @param request
 	 * @param modelview
 	 * @return
 	 */

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

@@ -211,24 +211,24 @@
                     </li>
                     <li th:class="${subM}=='apply'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/patent}">技术交易</a>
+                        <a th:href="@{/portal/service/patent}">知产申请</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">科技传播</a>
+                        <a th:href="@{/portal/service/serviceIndex}">知产运用</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='adviser'?active:''" >
                        <div>
-                         <a th:href="@{/portal/adviser}">科技咨询</a>
+                         <a th:href="@{/portal/adviser}">知产顾问</a>
                        </div>
                     </li>
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
-	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">科技金融</a>
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">技术交易</a>
 	 						<!-- <ol class="subnavigation">
 	                            <li>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
@@ -241,12 +241,12 @@
                     </li>
 					<li th:class="${subM}=='safeguarding'?active:''" >
 						<div>
-							<a th:href="@{/portal/service/safeguarding}">维权</a>
+							<a th:href="@{/portal/service/safeguarding}">法律维权</a>
 						</div>
 					</li>
 					<li th:class="${subM}=='eventPlanning'?active:''" >
 						<div>
-							<a th:href="@{/portal/eventPlanning}" >活动策划</a>
+							<a th:href="@{/portal/eventPlanning}" >关于技淘</a>
 						</div>
 					</li>
                      <!-- <li th:class="${subM}=='special'?active:''" >

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

@@ -51,41 +51,7 @@
 			<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 		</div>
 
-	<!-- 	<div class="indexSearch">
-			<ul class="jumpType">
-				<li class="active">成果</li>
-				<li>需求</li>
-				<li>专利</li>
-				<li>政策</li>
-				<li>项目</li>
-			</ul>
-			<div class="search-inp">
-				<div class="input-group searchDiv">
-					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
-					<img th:src="${portalHost+'/img/newMenu/searchImg.png'}" alt="" class="searchImg">
 
-				</div>
-				 <a  th:href="@{/portal/assessment}" class="zaixian">在线评估</a>
-
-
-				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate" class="gaoqi">高企自评</a>
-			</div>
-			<ul class="jump">
-				<li>
-					<a href="/portal/thinkTank/policyList?type=1">政策</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=0">资讯</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=99">技淘观点</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=98">知产百科</a>
-				</li>
-			</ul>
-			<span class="apply head_login">申请会员</span>
-		</div> -->
 
 	<!-- 主体内容区域 -->
 	<div id="terrace">
@@ -93,29 +59,7 @@
 
 				<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" />
 			</div>
-			<!--
-			<div class="terrace_cont">
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>智慧</h4>
-						<p>海量智力成果认知您的需求</p>
-					</div>
-				</div>
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>合伙</h4>
-						<p>秉承十七载荣赢数万客户</p>
-					</div>
-				</div><div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>社区</h4>
-						<p>严选数千位专家顾问答疑解惑</p>
-					</div>
-				</div>
-			</div>-->
+
 		</div>
 		<div id="apply">
 			<div class="apply">
@@ -162,55 +106,7 @@
 			</div>
 		</div>
 	</div>
-		<!-- <div id="wield">
-			<div class="terrace_title">
-				<img th:src="${portalHost+'/img/indedImg/inded4.png'}" alt="" />
-			</div>
-			<div class="wield_cont">
-				<div class="video">
-					<video id="video1" controls="true" controlslist="nodownload">
-						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 "  type="video/mp4">
-						<source th:src="${vurl == null? 'http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4': videoServer+vurl}"  type="video/mp4">
 
-						您的浏览器不支持 HTML5 video 标签。
-					</video>
-				</div>
-				<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
-			</div>
-				<div class="moreVideo">
-				<a href="/portal/video.html">查看更多视频 >></a>
-			</div>
-		</div> -->
-		<!-- <div class="brands">
-			<a th:href="@{/portal/service/brandBuild}">
-			<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
-			</a>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/marketOpen}">
-			<img th:src="${portalHost+'/img/indedImg/inded7.png'}" alt="" />
-			</a>
-			<div class="brandsDiv">
-				<img th:src="${portalHost+'/img/indedImg/inded31.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded32.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded33.jpg'}" alt="" />
-			</div>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/governmentSupport}">
-			<img th:src="${portalHost+'/img/indedImg/inded8.png'}" alt="" />
-			</a>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/taxFinance}">
-			<img th:src="${portalHost+'/img/indedImg/inded9.png'}" alt="" />
-			</a>
-			<div>
-				<img th:src="${portalHost+'/img/indedImg/inded34.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded35.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded36.jpg'}" alt="" />
-			</div>
-		</div> -->
 		<div id="hotProject">
 			<div class="terrace_title">
 				<img th:src="${portalHost+'/img/indedImg/inded10.png'}" alt="" />
@@ -224,8 +120,6 @@
 				</div>
 			</div>
 		</div>
-
-
 	<footer>
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>