Merge branch 'test' of http://192.168.1.195:9998/web_developers/webportal into test

# Conflicts: # index.html

Merge branch 'test' of http://192.168.1.195:9998/web_developers/webportal into test
# Conflicts: # index.html
liuqimichale
2 parents b30572fe 91fa0731
Showing 5 changed files with 63 additions and 29 deletions
images/index_footwb.png
images/index_footwx.png
index.html
js/nav-footer.js
style.css
@@ -118,33 +118,24 @@
 <div class="swiper-container">
     <div class="swiper-wrapper">
-        <div class="swiper-slide swiper-slide-1" >
-            <div class="swiper-slide-main">
-                <div class="park-point">
-                    <div class="parkpoint1 parkpoint"></div>
-                    <div class="parkpoint2 parkpoint"></div>
-                    <div class="parkpoint3 parkpoint"></div>
-                    <div class="parkpoint4 parkpoint"></div>
-                    <div class="parkpoint5 parkpoint"></div>
-                    <div class="parkpoint6 parkpoint"></div>
-                    <div class="parkpoint7 parkpoint"></div>
-                </div>
-                <div class="swiper-slide-large">物联改变时代 智慧停车 从现在开始</div>
-                <div class="swiper-slide-middle">快速、高效、不停车、不拥堵</div>
-                <div class="swiper-slide-more">了解更多</div>
-            </div>
-        </div>
-        <div class="swiper-slide swiper-slide-2">
-            <div class="swiper-slide-main swiper-slide-main-2">
-                <div class="swiper-slide-large">云端saas服务，大并发高可用架构</div>
-                <div class="swiper-slide-middle">为您的数字资产保驾护航 数据全方位呵护</div>
-                <div class="swiper-slide-more">了解更多</div>
-            </div>
-        </div>
+        <!--<div class="swiper-slide swiper-slide-1" >-->
+            <!--<div class="swiper-slide-main">-->
+                <!--<div class="swiper-slide-large">物联改变时代 智慧停车 从现在开始</div>-->
+                <!--<div class="swiper-slide-middle">快速、高效、不停车、不拥堵</div>-->
+                <!--<div class="swiper-slide-more">了解更多</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div class="swiper-slide swiper-slide-2">-->
+            <!--<div class="swiper-slide-main swiper-slide-main-2">-->
+                <!--<div class="swiper-slide-large">云端saas服务，大并发高可用架构</div>-->
+                <!--<div class="swiper-slide-middle">为您的数字资产保驾护航 数据全方位呵护</div>-->
+                <!--<div class="swiper-slide-more">了解更多</div>-->
+            <!--</div>-->
+        <!--</div>-->
         <div class="swiper-slide swiper-slide-3">
             <div class="swiper-slide-main swiper-slide-main-3">
-                <div class="swiper-slide-large">全方位解决方案 全数据云服务 全时空可视化</div>
-                <div class="swiper-slide-middle">最懂你、任你停</div>
+                <div class="swiper-slide-large">云端saas服务，大并发高可用架构</div>
+                <div class="swiper-slide-middle">为您的数字资产保驾护航 数据全方位呵护</div>
                 <div class="swiper-slide-more">了解更多</div>
             </div>
         </div>
@@ -891,10 +882,12 @@
             <div class="col-md-3 col-xs-6">
                 <div class="footer">
-                    <div class="footer-title">官方媒体</div>
+                    <div class="footer-media">官方媒体</div>
                     <ul class="footer-links">
-                        <li><a href="#">微信</a></li>
-                        <li><a href="#">微博</a></li>
+                        <span class="links_wechatIco rnt_pos_rel">
+                            <span class="rnt_wechat rnt_pos_abs"></span>
+                        </span>
+                        <a href="http://www.weibo.com"><span class="links_weiboIco"></span></a>
                     </ul>
                 </div>
             </div>
@@ -940,6 +933,7 @@
 <script type="text/javascript" src="js/jquery.counterup.min.js"></script>
 <script type="text/javascript" src="js/swiper.js"></script>
 <script type="text/javascript" src="js/gmaps.min.js"></script>
-<script type="text/javascript" src="js/main.js?a=1"></script>
+<script type="text/javascript" src="js/nav-footer.js"></script>
+<script type="text/javascript" src="js/main.js"></script>
 </body>
 </html>
+
+$(function(){
+
+});
 \ No newline at end of file
@@ -2341,6 +2341,9 @@ a:hover{
 .footer-title{
     margin-bottom: 38px;
 }
+.footer-media{
+    margin-bottom: 20px;
+}
 .footer-links li a,.footer-links li{
     font-size:16px;
     font-family:PingFang-SC-Medium;
@@ -2355,6 +2358,33 @@ a:hover{
 .footer-links li:last-of-type{
     margin-bottom: 0;
 }
+.links_wechatIco{
+	background: url("images/index_footwx.png") no-repeat;
+	width: 31px;
+	height: 31px;
+	display: inline-block;
+	cursor: pointer;
+}
+.links_weiboIco{
+	background: url("images/index_footwb.png") no-repeat;
+	width: 31px;
+	height: 31px;
+	margin-left: 15px;
+	display: inline-block;
+	cursor: pointer;
+}
+.rnt_wechat{
+	width: 120px;
+	height: 120px;
+	background: #0b0b0b;
+	border-radius: 4px;
+	top:51px;
+	left: 0px;
+	display: none;
+}
+.links_wechatIco:hover .rnt_wechat{
+	display: block;
+}
 .bottom-footer{
     width: 1200px;
     margin: 0 auto;
@@ -2368,6 +2398,12 @@ a:hover{
     font-weight:500;
     color:rgba(255,255,255,.5);
 }
+.rnt_pos_rel{
+	position: relative;
+}
+.rnt_pos_abs{
+	position: absolute;
+}
 /*===================
 	End Footer CSS
 =====================*/