Browse Source

修改冲突文件

wanghui 8 years ago
parent
commit
85faa6ee7e
1 changed files with 0 additions and 14 deletions
  1. 0 14
      src/main/webapp/WEB-INF/views/portal/index.html

+ 0 - 14
src/main/webapp/WEB-INF/views/portal/index.html

@@ -70,23 +70,13 @@
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-<<<<<<< HEAD
 				<h2>买专利,享九折,立即领取</h2>
-=======
-				<h2>专利申请,限时九折</h2><br/>
-				<h2>(前100个)</h2>
->>>>>>> branch 'dev' of https://git.coding.net/aft/AFT.git
 				<p>有限期至:2017-10-1</p>
 				</a>						
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-<<<<<<< HEAD
 				<h2>百元做软著,限量领取</h2>
-=======
-				<h2>100元软著全包</h2><br/>
-				<h2>(限量100个)</h2>
->>>>>>> branch 'dev' of https://git.coding.net/aft/AFT.git
 				<p>有限期至:2017-10-1</p>
 				</a>								
 			</div>
@@ -99,10 +89,6 @@
 	<div id="product">
 		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
 		<div class="content">
-			<div class="con_hover">
-				<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
-				<p>详情</p>
-			</div>
 			<div class="cont cont_top1">
 				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">