Merge branch 'feature-201802-wangcz' into dev

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

@@ -205,6 +205,21 @@
 		</div>
 	</div>
 	<!-- body End -->
+
+	<!-- 金控广告 -->
+	<div class="jinkong_bottom"></div>
+	<div class="jinkong">
+		<div class="container">
+			<div class="img">
+				<span class="qcrode_close close">×</span>
+                <span class="close time">5s</span>
+				<img src="static/img/jinkong/xiaoren.png" id="img_xiaoren">
+				<img src="static/img/jinkong/qrcode.png">
+			</div>
+		</div>
+	</div>
+ 	<!-- -金控广告 -->
+
 	<!-- footer Start -->
 	<div class="navbar navbar-static-bottom" id="footer">
 		<div class="container">
@@ -277,6 +292,34 @@
 	<script src="static/lib/jquery/jquery.min.js"></script>
 	<script src="static/lib/bootstrap/js/bootstrap.js"></script>
 <script type="text/javascript">
+	// 金控广告动画设置
+	$(function() {
+        var closeClick = function () {
+            var display = $('.jinkong_bottom').css('display')
+            if (display === 'none') {
+                $('.jinkong').fadeOut(500)
+            } else {
+                $('.jinkong_bottom').fadeOut(500)
+                $('.jinkong .img').addClass('img_stater')
+                $('#img_xiaoren').addClass('animation_xr')
+            }
+        }
+        var count  = 6
+        var getLoc = function () {
+            count--;
+            $('.time').html(count + 's');
+            if (count <= 0) {
+                $('.time').hide()
+                clearInterval(timeOut)
+                closeClick()
+            }
+        }
+	    $('.qcrode_close').click(function() {
+            closeClick()
+		})
+        var timeOut = setInterval(getLoc,1000);
+	})
+
 	$(function(){
 		// 新手引导
 		$('#mask,#searchTip,#searchTip div:eq(0)').show();

src/main/webapp/resources/css/index.css

@@ -4726,3 +4726,148 @@ a.order-detail {
 .stepC em.img{
 	background: url(../img/guide/more3.png) no-repeat center center;
 }
+
+
+/**
+* 金控广告
+**/
+.jinkong_bottom{
+	width:100%;
+	height:241px;
+	position:fixed;
+	bottom:0;
+	z-index:10000;
+	margin-bottom:-241px;
+	background: url(../img/jinkong/tangchuan.png)no-repeat center center;
+    animation: shift_up 1s linear 1s forwards;
+    -o-animation: shift_up 1s linear 1s forwards;
+    -webkit-animation: shift_up 1s linear 1s forwards;
+    -moz-animation: shift_up 1s linear 1s forwards;
+}
+@keyframes shift_up {
+	form{margin-bottom: -241px;opacity:0;}
+	to{margin-bottom:0;opacity:1;}
+}
+@-o-keyframes shift_up {
+	form{margin-bottom: -241px;opacity:0;}
+	to{margin-bottom:0;opacity:1;}
+}
+@-webkit-keyframes shift_up {
+	form{margin-bottom: -241px;opacity:0;}
+	to{margin-bottom:0;opacity:1;}
+}
+@-moz-keyframes shift_up {
+	form{margin-bottom: -241px;opacity:0;}
+	to{margin-bottom:0;opacity:1;}
+}
+.jinkong .close{
+	display:inline-block;
+	width:20px;
+	height:20px;
+	background: #fff;
+	color:#666;
+	border-radius:50%;
+	font-size: 18px;
+	line-height: 16px;
+	text-align: center;
+	opacity:.7;
+}
+.jinkong{
+	position:fixed;
+	bottom:0;
+	z-index:10000;
+	width:100%;
+	margin-bottom:-241px;
+	animation: shift_up 1s linear 1s forwards;
+	-o-animation: shift_up 1s linear 1s forwards;
+	-webkit-animation: shift_up 1s linear 1s forwards;
+	-moz-animation: shift_up 1s linear 1s forwards;
+}
+
+.jinkong .img{
+	position:relative;
+	width:80px;
+	height:130px;
+	top:-100px;
+	right:-765px;
+    transform:scale(.8);
+    -o-transform:scale(.8);
+    -webkit-transform:scale(.8);
+    -moz-transform:scale(.8);
+}
+.img_stater{
+	animation: shift_left 1s linear forwards;
+	-webkit-animation: shift_left 1s linear forwards;
+	-o-animation: shift_left 1s linear forwards;
+	-moz-animation: shift_left 1s linear forwards;
+}
+.jinkong .animation_xr{
+	animation:img_scale 1s linear 2s infinite;
+	-o-animation:img_scale 1s linear 2s infinite;
+	-webkit-animation:img_scale 1s linear 2s infinite;
+	-moz-animation:img_scale 1s linear 2s infinite;
+}
+@keyframes shift_left {
+	0%{right: -765px;transform:scale(.8);}
+	80%{right: -65px;transform:scale(.8);}
+	100%{right:-20px;transform:scale(1);}
+}
+@-o-keyframes shift_left {
+    0%{right: -765px;transform:scale(.8);}
+    80%{right: -65px;transform:scale(.8);}
+    100%{right:-20px;transform:scale(1);}
+}
+@-webkit-keyframes shift_left {
+    0%{right: -765px;transform:scale(.8);}
+    80%{right: -65px;transform:scale(.8);}
+    100%{right:-20px;transform:scale(1);}
+}
+@-moz-keyframes shift_left {
+    0%{right: -765px;transform:scale(.8);}
+    80%{right: -65px;transform:scale(.8);}
+    100%{right:-20px;transform:scale(1);}
+}
+@keyframes img_scale {
+	0%{transform:scale(1);}
+	50%{transform:scale(.8);}
+	100%{transform:scale(1);}
+}
+@-o-keyframes img_scale {
+	0%{transform:scale(1);}
+	50%{transform:scale(.8);}
+	100%{transform:scale(1);}
+}
+@-webkit-keyframes img_scale {
+	0%{transform:scale(1);}
+	50%{transform:scale(.8);}
+	100%{transform:scale(1);}
+}
+@-moz-keyframes img_scale {
+	0%{transform:scale(1);}
+	50%{transform:scale(.8);}
+	100%{transform:scale(1);}
+}
+.jinkong .img .qcrode_close{
+	position:absolute;
+	right:-25px;
+	top:0;
+}
+.jinkong .img .time{
+    position:absolute;
+    right:-50px;
+    top:0;
+    color:#333;
+}
+.jinkong .img .qcrode_close:hover{
+    background: #666;
+    color:#fff;
+}
+.jinkong .img img{
+	display:block;
+	vertical-align: top;
+	text-align: center;
+}
+#img_xiaoren{
+    position:relative;
+    top:10px;
+}

src/main/webapp/resources/tpl/index/home/right.html

@@ -7,9 +7,38 @@
 		overflow: hidden;
 	}
 	.toto-menu{
+		position:relative;
 		width: 100%;
 		margin: 0 auto;
 	}
+	.toto-menu .advertising {
+		position:absolute;
+		top:0;
+		left:0;
+		margin-left: 80px;
+		animation: right_shift 2s linear 2s forwards;
+		-o-animation: right_shift 2s linear 2s forwards;
+		-webkit-animation: right_shift 2s linear 2s forwards;
+		-moz-animation: right_shift 2s linear 2s forwards;
+	}
+	
+	@keyframes right_shift {
+		form{margin-left: 80px;}
+		to{margin-left:590px;}
+	}
+	@-o-keyframes right_shift {
+		form{margin-left: 80px;}
+		to{margin-left:590px;}
+	}
+	@-webkit-keyframes right_shift {
+		form{margin-left: 80px;}
+		to{margin-left:590px;}
+	}
+	@-moz-keyframes right_shift {
+		form{margin-left: 80px;}
+		to{margin-left:590px;}
+	}
+	
 	.toto-menu .row{
 		margin: 0 0 15px;
 		width: 755px;
@@ -253,6 +282,9 @@
 		<div class="border01 todo-content" ng-controller="TodoCtrl">
 			<!--工作台导航-->
 			<div class="toto-menu">
+				<div class="advertising">
+					<img src="static/img/jinkong/flag.gif">
+				</div>
 				<div class="menu01 row">
 					<div class="header"><img src="static/img/home/xiaoshou.png" alt=""/>销售</div>
 					<div class="content">
@@ -543,7 +575,7 @@
 			<div class="carousel-inner">
 				<div class="item active">
 					<a href="http://www.yitoa-fintech.com/" target="_blank">
-						<img src="static/img/home/UU.png" alt="First slide" >
+						<img src="static/img/home/jingkong.png" alt="First slide" >
 					</a>
 				</div>
 				<!-- <div class="item">