Browse Source

Merge remote-tracking branch 'origin/dev' into dev

wanghui 8 years ago
parent
commit
26a6efc9b2

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -12,7 +12,7 @@
 	</header>
 	<!--banner-->
   	<div class="carouselt">
-		<ul class="ct-img-big clear">
+		<ul class="ct-img-bi clear">
 			<li data-index=0 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=1 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -184,7 +184,7 @@
 	        </div>
 	        <div class="field_8">
 	        	<img th:src="${portalHost+'/img/hightech14.png'}" alt="" />
-	            <div>高新技术改造传统产业</div>
+	            <div>先进制造与自动化</div>
 	        </div>
 	    </div>
 	</div>

+ 6 - 3
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -18,12 +18,15 @@
 			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
 		</ul>
-		<a class="btn btn-next" href="">
+		<!-- <a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
 			<img th:src="${portalHost+'/img/index_pre.png'}" alt=""/>
-		</a>
+		</a> -->
+		<ul class="ct-img-small clear">
+
+		</ul>
 	</div>
 	<!--主体内容区域开始-->
   	<div class="service_main">
@@ -39,7 +42,7 @@
 							<img th:src="${portalHost+'/img/tech_tyhs.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_ty.png'}" alt=""/>
 						</span>
-						<h3>专业诊断保障</h3>
+						<h3>专业诊断保障</h3>
 						<p>专家一对一服务,为客户科学诊项目,构建方案,详解政策,可帮助企业进行精准诊断,为企业尽可能增加申报成功率,尽可能达到一次通过。</p>
 					</div>
 					<div>

+ 15 - 12
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -13,18 +13,21 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+		</ul>
+		<!-- <a class="btn btn-next" href=""> <img
+			th:src="${portalHost + '/img/index_next.png'}" alt="" />
+		</a> <a class="btn btn-pre" href=""> <img
+			th:src="${portalHost + '/img/index_pre.png'}" alt="" />
+		</a>-->
+		<ul class="ct-img-small clear">
+
 		</ul>
-		<a class="btn btn-next" src="">
-			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
-		</a>
-		<a class="btn btn-pre" src="">
-			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
 	</div>
 	
 	<!--主体内容区域开始-->
@@ -97,7 +100,7 @@
 								<li value="0"><span>完全转让</span></li>
 								<li value="1"><span>许可转让</span></li>
 								<li value="2"><span>技术入股</span></li>
-								<li value="3"><span>5年独占许可转让</span></li>
+								<li value="3"><span>合作开发</span></li>
 							</ul>
 						</div>
 					</div>

+ 15 - 11
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -14,18 +14,22 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+		</ul>
+		<!-- <a class="btn btn-next" href=""> <img
+			th:src="${portalHost + '/img/index_next.png'}" alt="" />
+		</a> <a class="btn btn-pre" href=""> <img
+			th:src="${portalHost + '/img/index_pre.png'}" alt="" />
+		</a> -->
+
+		<ul class="ct-img-small clear">
+
 		</ul>
-		<a class="btn btn-next" src="">
-			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
-		</a>
-		<a class="btn btn-pre" src="">
-			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
 	</div>
 	<!--主体内容区域开始-->
   	<div class="contant">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -60,7 +60,7 @@
 			<div th:if="${showflg} == 0 ">
 				<div class="detailcenter_">
 					<img th:src="${portalHost+ '/img/all_null.png'}" alt="" />
-				</div>
+				</div> 
 			</div>
 
 			<div class="detailcenter_right">