Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

yee 8 years ago
parent
commit
b151d2fd56

+ 7 - 6
html/css/highTech.css

@@ -9,17 +9,17 @@ h4{margin: 0; padding: 0;}
 .search button:active{background: #58a3ff;border-color: #58a3ff; color: #fff;outline: none;}
 .search button:focus{background: #58a3ff;border-color: #58a3ff; color: #fff;outline: none;}
 
-nav{border-bottom: 1px solid #ececec;background: #fafafa; overflow: auto; margin-bottom: 20px;}
+nav{border-bottom: 1px solid #ececec;background: #fafafa; overflow: auto; margin-bottom: 42px;}
 nav ul li{float: left;}
 nav ul li.active a{line-height: 36px!important;}
 nav a{height: 40px;line-height: 44px;display: inline-block;text-align: center; color: #333333; padding: 0 20px;}
 nav a:hover{color: #333333;}
 .active{background: #fff; border:1px solid #ececec; border-top:4px solid #58a3ff; border-bottom: none; color: #58a3ff}
 
-.content{padding: 20px; border: 1px solid #ececec; overflow: auto;}
+.content{/*padding: 20px; border: 1px solid #ececec;*/ overflow: auto;}
 .content h4{padding-left: 10px; border-left: 4px solid #58a3ff; margin-bottom: 20px;}
-.discount{margin-bottom: 40px; overflow: auto;}
-.discount_content{width: 180px;height: 248px; padding: 10px; margin-right: 14px; border: 1px solid #d9eaff; float: left;}
+.discount{margin-bottom: 60px; overflow: auto;}
+.discount_content{width: 180px;height: 248px; padding: 10px; margin-right: 25px; border: 1px solid #d9eaff; float: left;}
 .clear_mg{margin-right: 0;}
 .discount_img{text-align: center;margin: 10px 0 20px 0;}
 .discount_info{font-size: 14px; }
@@ -31,8 +31,9 @@ nav a:hover{color: #333333;}
 .purple{color: #9a53f2;}
 .discount_info p{line-height: 22px; color: #7a7a7a;}
 
-.flow_chart{margin: 20px 0 40px 0;text-align: center;}
-.advantage { padding: 10px 0 0 14px;}
+.process{background: #f0f7ff; padding-top: 20px; margin-bottom: 20px;}
+.flow_chart{margin: 20px 0 60px 0;text-align: center;}
+.advantage { padding: 10px 0 0 34px;}
 .advantage li {list-style-image: url(../img/li_ioc.png);}
 .advantage span{margin-bottom: 20px; display: block; color: #333333;font-weight: bold;}
 .advantage p{line-height: 28px;color: #666666; margin-bottom: 30px;}

+ 28 - 11
html/highTech.html

@@ -4,13 +4,13 @@
 		<meta charset="utf-8" />
 		<title></title>
 		<!-- 新 Bootstrap 核心 CSS 文件 -->
-		<link href="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+		<link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 		<link href="css/style.css" rel="stylesheet"/>
 		<link href="css/highTech.css" rel="stylesheet"/>
 		<!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
-		<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
+		<script src="//cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
 		<!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
-		<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+		<script src="//cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 	</head>
 	<body>
 		<header>
@@ -99,11 +99,28 @@
  							</div>
  						</div>
  					</div>
- 					<h4>高企认定流程:</h4>
- 					<div class="flow_chart">
- 						<img src="img/flowChart.png" />
- 					</div>
- 					<h4>我们的优势</h4>
+ 					
+ 				</div>
+			</div>
+		</div>
+		<div class="process">
+			<div class="container">
+				<div class="row clearfix">
+					<div class="content">
+						<h4>高企认定流程:</h4>
+	 					<div class="flow_chart">
+	 						<img src="img/flowChart.png" />
+	 					</div>
+	 					
+	 				</div>
+	 			</div>
+	 		</div>
+		</div>
+		
+		<div class="container">
+			<div class="row clearfix">
+				<div class="content">
+					<h4>我们的优势</h4>
  					<div class="advantage">
  						<ul>
  							<li>
@@ -134,8 +151,8 @@
  							</li>
  						</ul>
  					</div>
- 				</div>
-			</div>
-		</div>
+				</div>
+ 			</div>
+ 		</div>
 	</body>
 </html>

BIN
html/img/flowChart.png


File diff suppressed because it is too large
+ 7 - 3
html/index.html


+ 1 - 1
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -171,7 +171,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
             if (values.state || values.principal || values.recordTime || values.comment) {
-                if (!values.state && !values.principal && !values.recordTime) {
+                if (!values.state || !values.principal || !values.recordTime) {
                     message.warning("请填写完整的状态流转信息!");
                     return;
                 };