Browse Source

Merge branch 'master' of ssh://10.10.101.21/source/platform-home into dev

hejq 8 years ago
parent
commit
6ecf746e4c

+ 1 - 1
src/main/webapp/WEB-INF/views/normal/contact.html

@@ -35,7 +35,7 @@
 						<ul>
 							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
 							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
-							<li><a href="http://bbs.uuzcc.com/forum.php">工程师交流圈</a></li>
+							<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
 						</ul>
 					</li>
 					<li>

+ 1 - 1
src/main/webapp/WEB-INF/views/normal/index.html

@@ -67,7 +67,7 @@ var _hmt = _hmt || [];
 						<ul>
 							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
 							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
-							<li><a href="http://bbs.uuzcc.com/forum.php">工程师交流圈</a></li>
+							<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
 						</ul>
 					</li><!-- http://public.ubtob.com -->
 					<li>

+ 9 - 9
src/main/webapp/WEB-INF/views/normal/saas_about.html

@@ -37,7 +37,7 @@
 						<ul>
 							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
 							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
-							<li><a href="http://bbs.uuzcc.com/forum.php">工程师交流圈</a></li>
+							<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
 						</ul>
 					</li>
 					<!-- http://member.ubtob.com -->
@@ -66,13 +66,13 @@
 	<!-- header start -->
 	<header>
 		<div class="hd-background">
-			<img src="static/img/about_saas/header_bg.jpg" alt=""
-				style="max-height: 600px;" width="100%" />
+			<img src="static/img/about_saas/header_bg_new.jpg" alt=""
+				style="height:685px;" width="100%" />
 		</div>
 		<div class="hd-content">
-			<div class="container">
+			<div class="container" style="width:1320px!important;">
 				<div class="row">
-					<div class="col-md-10 col-md-offset-1 text-center">
+					<div class="col-md-12 text-center">
 						<div class="header-text">
 							<h2>优企云服</h2>
 							<p>零成本投入 免费使用 / 全流程管理 简单易用 / 优软服务连接企业与企业 / 跨地域 移动办公</p>
@@ -82,13 +82,13 @@
 				<div class="text-center">
 					<a class="btn btn-experience"
 						href="http://make-guest.saas.ubtob.com/" target="_blank"
-						style="margin-right: 20px"> 立即体验 </a> <a
-						class="btn btn-experience btn-apply" href="javascript:void(0);"> 免费开通 </a>
+						style="margin-right: 20px;font-size: 24px;width:156px;height:49px;font-weight:bold;"> 立即体验 </a>
+					<a class="btn btn-experience btn-apply" href="javascript:void(0);" style="font-size: 24px;font-weight:bold;width:156px;height:49px;"> 免费开通 </a>
 				</div>
 				<div class="row">
-					<div class="col-md-10 col-md-offset-1">
+					<div class="col-md-12">
 						<div class="uas-snapshot">
-							<img src="static/img/about_saas/snapshot.png" alt="" width="100%" />
+							<img src="static/img/about_saas/snapshot_new.png" alt="" style="height:337px;"/>
 						</div>
 					</div>
 				</div>

+ 1 - 1
src/main/webapp/resources/css/common.css

@@ -84,7 +84,7 @@ body {
 	right: 0;
 	padding-left: 10px;
 	line-height: 20px;
-	width: 90px;
+	width: 71px;
 	padding-bottom: 10px;
 	background: #474443;
 	overflow-y: hidden;

+ 20 - 4
src/main/webapp/resources/css/saas_about.css

@@ -4,6 +4,7 @@ header {
     color: #ffffff;
     font-family: '微软雅黑';
     overflow: hidden;
+	height:685px;
 }
 
 .hd-content {
@@ -18,15 +19,16 @@ header {
 }
 
 .header-text h2 {
-	font-size: 3em;
-	font-weight: 600;
+	font-size: 50px;
+	font-weight: bold;
 	letter-spacing: .1em;
 	text-shadow: 3px 3px 3px #666666;
 	margin-bottom: 20px;
 }
 
 .header-text p {
-	font-size: 18px;
+	font-size: 30px;
+	text-shadow: 3px 3px 3px #666666;
 }
 
 .btn-experience {
@@ -48,10 +50,24 @@ header {
 	color: #ffffff;
 }
 
-.hd-content .uas-snapshot {
+.hd-content .uas-snapshot img{
 	position: relative;
+	width:100%;
+	animation: animation-upslide .5s linear
 }
 
+@keyframes animation-upslide{
+	0%{
+		top:200px;
+		opacity: .6;
+	}
+	100%{
+		top: 0;
+		opacity: 1;
+	}
+}
+
+
 /* main */
 
 /* sections */

BIN
src/main/webapp/resources/img/about_saas/header_bg_new.jpg


BIN
src/main/webapp/resources/img/about_saas/snapshot_new.png