Browse Source

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

yee 8 years ago
parent
commit
773d26e70c

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

@@ -381,7 +381,19 @@ public class WebpageController extends BaseController {
 	}
 	
 	/**
+	 * 评估页
+	 */
+	@RequestMapping(value = "/portal/evaluation/index", method = RequestMethod.GET)
+	public ModelAndView evaluation(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/evaluation/index");
+		return modelview;
+	}
+	
+	/**
 	 * 策源地
+	 * @param request
+	 * @param modelview
+	 * @return
 	 */
 	@RequestMapping(value = "/portal/news/newsIndex", method = RequestMethod.GET)
 	public ModelAndView portalNewsNewsIndex(HttpServletRequest request, ModelAndView modelview) {
@@ -415,10 +427,6 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/technologyTrading/index");
 		return modelview;
 	}
-	
-	
-
-	
 
 	private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
 		String key = TokenManager.getUserId();

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/common.html


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

@@ -32,7 +32,7 @@
 			</div>
 			<div class="col-md-5">
 				<ul class="nav_content">
-					<li><a th:href="${basePath + '/protal/search/demand.html'}">技术交易</a></li>
+					<li><a th:href="${basePath + '/portal/search/demand.html'}">技术交易</a></li>
 					<li class="active"><a href="#">需求</a></li>
 				</ul>
 			</div>

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/evaluation/index.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html