albertshaw лет назад: 8
Родитель
Сommit
d3bb10bfdc

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

@@ -47,7 +47,9 @@
   <th:block th:fragment="subMenu">
   	<ul class="nav_content">
 		<li class="home"><a th:href="${basePath + '/portal/index.html'}">首页</a></li>
-		<li><a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
+		<li>
+		<!-- <a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a> -->
+		<a th:href="${basePath + '/portal/search/achievement.html'}">技术交易</a>
 			<ul class="secondary_navigation_nav">
 				<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
 				<li><a

+ 1 - 6
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -56,12 +56,7 @@
 		</div>
 		<div class="container activity_details">
 			<div class="activity_details_img">
-<<<<<<< HEAD
-				<img th:src="${portalHost +'/img/activity_details_img.png'}">
-=======
-				<img
-					th:src="${portalHost +'/img/activity_details_img.jpg'}">
->>>>>>> 44881295eebc923e2703e39d4ce365e48330edba
+				<img th:src="${portalHost +'/img/activity_details_img.jpg'}">
 			</div>
 			<div class="activity_details_content">
 				<ul>