|
|
@@ -138,12 +138,8 @@
|
|
|
</div>
|
|
|
<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
|
|
|
<div class="process_btn">
|
|
|
-<<<<<<< HEAD
|
|
|
- <a href="/user/account/index.html#normal" >立即评估</a>
|
|
|
-=======
|
|
|
- <a>立即评估</a>
|
|
|
->>>>>>> branch 'patch' of https://git.coding.net/aft/AFT.git
|
|
|
- <a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
|
|
|
+ <a href="/user/account/index.html#normal" >立即评估</a>
|
|
|
+ <a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="services" id="services">
|