anderx hace 4 años
padre
commit
ac0e886e86

+ 26 - 20
src/main/java/com/kede/common/controller/WebpageController.java

@@ -102,26 +102,32 @@ public class WebpageController extends BaseController {
 	 * @param modelview
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
-	@RequestMapping(value = "/portal/newsDetails", method = RequestMethod.GET)
-	public ModelAndView portalNewsDetails(HttpServletRequest request, ModelAndView modelview,Integer id) {
-		modelview.setViewName("/portal/newsDetails");
-		InputBannerDetails ibd=new InputBannerDetails(1,4);
-		OutBannerDetails o=new OutBannerDetails();
-		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
-		o=list.size()>0?list.get(0):null;
-		modelview.addObject("banners",o);
-		OutNews outNews = newsService.selectNews(new InputNews(id));
-		String title=outNews.getTitle();
-		if (title.length()>18)title=title.substring(0,18);
-		String content = outNews.getContent();
-		if (content.length()>180)content=content.substring(0,180);
-		modelview.addObject("tt",title);
-		modelview.addObject("content",removeHtmlTag(content));
-		modelview.addObject("news",outNews);
-		return modelview;
-	}
+//	@SuppressWarnings("unchecked")
+//	@RequestMapping(value = "/portal/newsDetails", method = RequestMethod.GET)
+//	public ModelAndView portalNewsDetails(HttpServletRequest request, ModelAndView modelview,Integer id) {
+//		modelview.setViewName("/portal/newsDetails");
+//		InputBannerDetails ibd=new InputBannerDetails(1,4);
+//		OutBannerDetails o=new OutBannerDetails();
+//		List<OutBannerDetails> list=(List<OutBannerDetails>) bannersService.listBannersDetails(ibd, 1, 1).getList();
+//		o=list.size()>0?list.get(0):null;
+//		modelview.addObject("banners",o);
+//		OutNews outNews = newsService.selectNews(new InputNews(id));
+//		String title=outNews.getTitle();
+//		if (title.length()>18)title=title.substring(0,18);
+//		String content = outNews.getContent();
+//		if (content.length()>180)content=content.substring(0,180);
+//		modelview.addObject("tt",title);
+//		modelview.addObject("content",removeHtmlTag(content));
+//		modelview.addObject("news",outNews);
+//		return modelview;
+//	}
 
+	/**
+	 * 新闻详情
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/news/{id}", method = RequestMethod.GET)
 	public ModelAndView newsDetails(HttpServletRequest request, ModelAndView modelview,@PathVariable Integer id) {
@@ -136,7 +142,7 @@ public class WebpageController extends BaseController {
 		if (title.length()>18)title=title.substring(0,18);
 		String content = outNews.getContent();
 		if (content.length()>180)content=content.substring(0,180);
-		modelview.addObject("title",title);
+		modelview.addObject("tt",title);
 		modelview.addObject("content",removeHtmlTag(content));
 		modelview.addObject("news",outNews);
 		return modelview;

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

@@ -61,9 +61,9 @@ template.cacheable=false
 avatar.upload.host=//172.16.0.255:3000/upload
 #连接开�
 
-portal.host=//kedejs.jishutao.com/portal/1.0.20
+#portal.host=//kedejs.jishutao.com/portal/1.0.20
 #portal.host=//172.16.0.52/portal/1.0.19
-#portal.host=//172.16.0.255:3000/1.0.20
+portal.host=//172.16.0.255:3000/1.0.21
 
 static.host=//kedejs.jishutao.com/client/1.0.5
 #static.host=//172.16.0.52/client/1.0.5

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

@@ -413,11 +413,11 @@
                     <ul style="margin-top: 38px;">
                         <li><a th:href="${basePath+'/service/gqpy?0'}">高企认定</a></li>
                         <li><a th:href="${basePath+'/service/gqpy?1'}">高企培育</a></li>
-                        <li><a th:href="${basePath+'/service/csfw?2'}">财税筹划</a></li>
+                        <li><a th:href="${basePath+'/service/csfw?7'}">财税筹划</a></li>
                         <li><a th:href="${basePath+'/service/csfw?3'}">研发奖补</a></li>
                     </ul>
                     <ul style="margin-top: 38px;">
-                        <li><a th:href="${basePath+'/service/txrz?12'}">两化融合</a></li>
+                        <li><a th:href="${basePath+'/service/txrz?9'}">两化融合</a></li>
                         <li><a >专利转让</a></li>
                         <li><a >创客空间</a></li>
                         <li><a th:href="${basePath+'/service?5'}">博士工作站 </a></li>

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

@@ -942,13 +942,13 @@
 
         <script>
             if(window.location.search == "?fzlc") {
-                $(".about-kede-secodn > div > ul > li").eq(4).click()
+                $(".about-kede-secodn > div > ul > li").eq(5).click()
             }else if(window.location.search == "?ryzz") {
-                $(".about-kede-secodn > div > ul > li").eq(2).click()
+                $(".about-kede-secodn > div > ul > li").eq(3).click()
             }else if(window.location.search == "?qywh") {
                 $(".about-kede-secodn > div > ul > li").eq(1).click()
             }else if(window.location.search == "?qggs") {
-                $(".about-kede-secodn > div > ul > li").eq(3).click()
+                $(".about-kede-secodn > div > ul > li").eq(4).click()
             }
             jobs()
         </script>