Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

wanghui 8 years ago
parent
commit
471d8eb5f0

+ 10 - 1
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -54,10 +54,19 @@ public class NewsController extends BaseController {
 	 * 新闻详情
 	 */
 	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
-	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview, String noCache) {
+	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/news/newsDetails");
 		return modelview;
 	}
+	
+	/**
+	 * 新闻详情APP
+	 */
+	@RequestMapping(value = "/portal/news/newsDetailApp", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsDetailApp(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetailApp");
+		return modelview;
+	}
 
 	/**
 	 * 新闻详情列表

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

@@ -43,7 +43,7 @@
 	            <ul id="industryList" class="clearfix"></ul>
 	          </div>
 	        </div>
-	        <div class="search-criteria row" id="industryChildrenBox">
+	        <div class="search-criteria row" id="industrySecondBox">
 	          <div class="search-title col-md-2"> <span>行业二级分类</span> </div>
 	          <div class="search-select col-md-10">
 	            <ul id="industryChildrenList" class="clearfix">
@@ -51,7 +51,7 @@
 	            </ul>
 	          </div>
 	        </div>
-	        <div class="search-criteria row" id="industryChildrenBox">
+	        <div class="search-criteria row" id="industryThirdBox">
 	          <div class="search-title col-md-2"> <span>行业三级分类</span> </div>
 	          <div class="search-select col-md-10">
 	            <ul id="industryChildrenList" class="clearfix">

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

@@ -43,7 +43,7 @@
 	            <ul id="industryList" class="clearfix"></ul>
 	          </div>
 	        </div>
-	        <div class="search-criteria row industryChildrenBox">
+	        <div class="search-criteria row" id="industrySecondBox">
 	          <div class="search-title col-md-2"> <span>行业二级分类</span> </div>
 	          <div class="search-select col-md-10">
 	            <ul id="industrySecondList" class="clearfix">
@@ -51,7 +51,7 @@
 	            </ul>
 	          </div>
 	        </div>
-	        <div class="search-criteria row industryChildrenBox">
+	        <div class="search-criteria row" id="industryThirdBox">
 	          <div class="search-title col-md-2"> <span>行业三级分类</span> </div>
 	          <div class="search-select col-md-10">
 	            <ul id="industryThirdList" class="clearfix">