Browse Source

冲突修改

zou_ht 8 years ago
parent
commit
72ae8d7557

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

@@ -54,8 +54,8 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/front/1.0.43
-portal.host=//static.jishutao.com/portal/2.0.0
+static.host=//static.jishutao.com/1.0.45
+portal.host=//static.jishutao.com/portal/2.0.3
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload
 

File diff suppressed because it is too large
+ 490 - 370
src/main/webapp/WEB-INF/views/common.html


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

@@ -107,19 +107,19 @@
 				<div class="rotate_two active">
 					<div class="two" value="0" rota="90">
 						<span></span>
-						<p>高新认定申报流程</p>
+						<p>申报流程</p>
 					</div>
 				</div>
 				<div class="rotate_three">
 					<div class="three" value="1" rota="110">
 						<span></span>
-						<p>高新认定需要的时间</p>
+						<p>申报时间</p>
 					</div>
 				</div>
 				<div class="rotate_four" id="rotate_four">
 					<div class="four" value="2" rota="130">
 						<span></span>
-						<p>高新技术企业认定评分</p>
+						<p>认定评分</p>
 					</div>
 				</div>
 			</div>

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

@@ -80,14 +80,11 @@
   				<ul>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_090.jpg'}" alt="" />
-	  					<p>保护产品创新和方法创新。授权时间需1-2年,保护时间20年。</p>
 	  				</li>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_091.jpg'}" alt="" />
-	  					<p>保护产品结构形状微创新等。授权时间需3-6个月,保护时间10年。</p>
 	  				<li>
 	  					<img th:src="${portalHost+'/img/property_092.jpg'}" alt="" />
-	  					<p>保护产品的外形和包装。授权时间3-6个月,保护时间10年。</p>
 	  				</li>
   				</ul>
   			</div>
@@ -166,14 +163,9 @@
   					</li>
   					<li>
   						<h6>一站式服务</h6>
-  						<p>专利申请、授权、下证、缴费提醒全程提醒</p>
+  						<p>专利申请、授权、下证、缴费提醒全过程服务</p>
   						<time>- <span>03</span> -</time>
   					</li>
-  					<li>
-  						<h6>钻石售后</h6>
-  						<p>专利申请、授权、下证、缴费提醒全程提醒</p>
-  						<time>-<span>04</span>-</time>
-  					</li>
   				</ul>
   			</div>
   		</div>