Sfoglia il codice sorgente

Merge branch 'master' into test

# Conflicts:
#	src/main/resources/props/config_local.properties
anderx 1 settimana fa
parent
commit
3586e0609e

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -38,13 +38,13 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//ss.jishutao.com/client/1.2.8
+
 portal.host=//ss.jishutao.com/portal/2.2.22
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 #本地
-#static.host=//172.16.1.187/client/1.2.8
+static.host=//172.16.1.187/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
 #portal.host=//172.16.0.255:3000/jitao/portal/1.2.18
 #portal.host=//172.16.1.187/portal/2.2.22

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

@@ -95,50 +95,50 @@
 					</p>
 
 				</li>
-				<li>
-					<div>科技传播</div>
-					<span>
-						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
-					</span>
-					<p>
-						<a th:href="@{/portal/service/serviceIndex#Md2}">品牌建设</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/serviceIndex#Md3}">市场开拓</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/serviceIndex#Md4}">政府扶持</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/serviceIndex#Md5}">减税免税</a>
-						<a th:href="@{/portal/service/serviceIndex#Md6}">融资租售   </a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/serviceIndex#Md7}">攻防利器</a>
-						<a th:href="@{/portal/service/serviceIndex#Md7}">他山己用</a>
-					</p>
-				</li>
-				<li>
-					<div>科技咨询</div>
-					<span>
-						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">
-					</span>
-						<p>
-						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexAchievement}">转换技术成果</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexDiff}">解决技术难题</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/technologyTrading/tradingIndex#assessOnline}">在线评估</a>
-					</p>
-					<!-- <p>
-						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
-					</p> -->
-				</li>
+<!--				<li>-->
+<!--					<div>科技传播</div>-->
+<!--					<span>-->
+<!--						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">-->
+<!--					</span>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md2}">品牌建设</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md3}">市场开拓</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md4}">政府扶持</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md5}">减税免税</a>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md6}">融资租售   </a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md7}">攻防利器</a>-->
+<!--						<a th:href="@{/portal/service/serviceIndex#Md7}">他山己用</a>-->
+<!--					</p>-->
+<!--				</li>-->
+<!--				<li>-->
+<!--					<div>科技咨询</div>-->
+<!--					<span>-->
+<!--						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">-->
+<!--					</span>-->
+<!--						<p>-->
+<!--						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexAchievement}">转换技术成果</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexDiff}">解决技术难题</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>-->
+<!--					</p>-->
+<!--					<p>-->
+<!--						<a th:href="@{/portal/technologyTrading/tradingIndex#assessOnline}">在线评估</a>-->
+<!--					</p>-->
+<!--					&lt;!&ndash; <p>-->
+<!--						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>-->
+<!--					</p> &ndash;&gt;-->
+<!--				</li>-->
 				<!-- <li>
 					<div>知识产权维权</div>
 					<span>
@@ -225,17 +225,17 @@
 	                        </ol> -->
                         </div>
                     </li>
-                    <li th:class="${subM}=='apply'?active:''" >
-                    <div>
-                        <a th:href="@{/portal/service/patent}">科技传播</a>
+<!--                    <li th:class="${subM}=='apply'?active:''" >-->
+<!--                    <div>-->
+<!--                        <a th:href="@{/portal/service/patent}">科技传播</a>-->
 
-                       </div>
-                    </li>
-                    <li th:class="${subM}=='adviser'?active:''" >
-                       <div>
-                         <a th:href="@{/portal/adviser}">科技咨询</a>
-                       </div>
-                    </li>
+<!--                       </div>-->
+<!--                    </li>-->
+<!--                    <li th:class="${subM}=='adviser'?active:''" >-->
+<!--                       <div>-->
+<!--                         <a th:href="@{/portal/adviser}">科技咨询</a>-->
+<!--                       </div>-->
+<!--                    </li>-->
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">绿色金融</a>
@@ -302,78 +302,78 @@
 				<div class="newbottom_cleft">
 					<div class="newbottom_clitem">
 						<div class="newbottom_clitit">知产申请</div>
-						<a href="/portal/service/patent#zxfb">
+<!--						<a href="/portal/service/patent#zxfb">-->
 							<div class="newbottom_clitxt">最新发布</div>
-						</a>
-						<a href="/portal/service/patent#zlfw">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent#zlfw">-->
 							<div class="newbottom_clitxt">专利服务</div>
-						</a>
-						<a href="/portal/service/patent#sbfw">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent#sbfw">-->
 							<div class="newbottom_clitxt">商标服务</div>
-						</a>
-						<a href="/portal/service/patent#bqfw">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent#bqfw">-->
 							<div class="newbottom_clitxt">版权服务</div>
-						</a>
-						<a href="/portal/service/patent#zcbk">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent#zcbk">-->
 							<div class="newbottom_clitxt">知产百科</div>
-						</a>
+<!--						</a>-->
 					</div>
 					<div class="newbottom_clitem">
 						<div class="newbottom_clitit">知产运用</div>
-						<a href="/portal/service/serviceIndex#Md2">
+<!--						<a href="/portal/service/serviceIndex#Md2">-->
 							<div class="newbottom_clitxt">品牌建设</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md3">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md3">-->
 							<div class="newbottom_clitxt">市场开拓</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md4">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md4">-->
 							<div class="newbottom_clitxt">政府扶持</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md5">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md5">-->
 							<div class="newbottom_clitxt">减税免税</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md6">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md6">-->
 							<div class="newbottom_clitxt">融资租售</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md7">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md7">-->
 							<div class="newbottom_clitxt">攻防利器</div>
-						</a>
-						<a href="/portal/service/serviceIndex#Md7">
+<!--						</a>-->
+<!--						<a href="/portal/service/serviceIndex#Md7">-->
 							<div class="newbottom_clitxt">他山己用</div>
-						</a>
+<!--						</a>-->
 					</div>
 					<div class="newbottom_clitem">
 						<div class="newbottom_clitit">知产交易</div>
-						<a href="/portal/technologyTrading/achievementList">
+<!--						<a href="/portal/technologyTrading/achievementList">-->
 							<div class="newbottom_clitxt">技术成果</div>
-						</a>
-						<a href="/portal/technologyTrading/demandList">
+<!--						</a>-->
+<!--						<a href="/portal/technologyTrading/demandList">-->
 							<div class="newbottom_clitxt">技术需求</div>
-						</a>
-						<a href="/portal/service/patent">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent">-->
 							<div class="newbottom_clitxt">交易政策</div>
-						</a>
-						<a href="/portal/adviser">
+<!--						</a>-->
+<!--						<a href="/portal/adviser">-->
 							<div class="newbottom_clitxt">咨询顾问</div>
-						</a>
+<!--						</a>-->
 					</div>
 					<div class="newbottom_clitem">
 						<div class="newbottom_clitit">实用工具</div>
-						<a href="/portal/technologyTrading/achievementList">
+<!--						<a href="/portal/technologyTrading/achievementList">-->
 							<div class="newbottom_clitxt">智能匹配</div>
-						</a>
-						<a href="/portal/evaluation/evaluate">
+<!--						</a>-->
+<!--						<a href="/portal/evaluation/evaluate">-->
 							<div class="newbottom_clitxt">在线评估</div>
-						</a>
-						<a href="/portal/technologyTrading/demandList">
+<!--						</a>-->
+<!--						<a href="/portal/technologyTrading/demandList">-->
 							<div class="newbottom_clitxt">精准匹配</div>
-						</a>
-						<a href="/portal/service/patent">
+<!--						</a>-->
+<!--						<a href="/portal/service/patent">-->
 							<div class="newbottom_clitxt">深度挖掘</div>
-						</a>
-						<a href="/portal/adviser">
+<!--						</a>-->
+<!--						<a href="/portal/adviser">-->
 							<div class="newbottom_clitxt">全程跟进</div>
-						</a>
+<!--						</a>-->
 					</div>
 					<div class="newbottom_clitem">
 						<div class="newbottom_clitit">关于技淘</div>