浏览代码

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html
limin 7 年之前
父节点
当前提交
bd66e28e67

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/companyProfile.html


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

@@ -59,15 +59,15 @@
 				<li>项目</li>
 			</ul> -->
 			<div class="search-inp">
-				<div class="input-group">
+				<div class="input-group searchDiv">
 					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
-					<span class="input-group-btn">
-						<button class="btn btn-default searchBtn" type="button">
-							<img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索
-						</button>
-					</span>
+					<img th:src="${portalHost+'/img/newMenu/searchImg.png'}" alt="" class="searchImg">
+				
 				</div>
-				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate">高企自评</a>
+				 <a  th:href="@{/portal/technologyTrading/tradingIndex#sytz}" class="zaixian">在线评估</a>
+				 
+				
+				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate" class="gaoqi">高企自评</a>
 			</div>
 			<ul class="jump">
 				<li>

文件差异内容过多而无法显示
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html