From ca72d485667a401dd9b873745313da0b7aa5d622 Mon Sep 17 00:00:00 2001
From: lh_wang <lh_wang@Ctrip.com>
Date: Tue, 4 Aug 2015 13:32:02 +0800
Subject: [PATCH] add display none

---
 lvtu/index.html |  4 ++--
 lvtu/js/main.js | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lvtu/index.html b/lvtu/index.html
index b08af25..716e7c9 100644
--- a/lvtu/index.html
+++ b/lvtu/index.html
@@ -81,7 +81,7 @@
 		<div class="car_run danmu" style="background-color:#E82D00;">
 			弹
 		</div>
-		<div class="car_run car_run_show">
+		<div class="car_run">
 			<i class="fa fa-info" style="font-size:17px;"></i>
 		</div>
 	</div>
@@ -97,7 +97,7 @@
 	</div>
 	<div id="toupiao_frame" style="display:none;width:350px;height:600px;position:absolute;right:80px;top:70px;background-color:#fff;border:1px solid #ddd;padding:2px;">
 		<iframe scrolling="no" src="http://123.57.39.116:9797/toupiao/index.html" style="width:100%;height:600px;border:0;"></iframe>
-		<div class="iframe_all_arrow" style="top:148px;z-index:80;"></div>
+		<div class="iframe_all_arrow" style="top:28px;z-index:80;"></div>
 	</div>
 	<!--<script type="text/javascript" src="js/ani.js"></script>-->
 	<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=6a1180467b5f36714645d22044535ab7"></script>
diff --git a/lvtu/js/main.js b/lvtu/js/main.js
index 97b0653..ce03825 100644
--- a/lvtu/js/main.js
+++ b/lvtu/js/main.js
@@ -254,17 +254,17 @@
 	}
 	
 	//开启、关闭弹幕
-	var tag = 0;
 	$('.danmu').on('click', function(){
-		if(tag % 2 === 0){
+		$('#toupiao_frame').hide();
+		if($('#tanmu_div').css('display') === 'none' || parseInt($('#tanmu_div').css('top')) < 0){
 			$('#tanmu_div').fadeIn();
 			$('#tanmu_div').css('right', '79px');
 			$('#tanmu_div').css('top', '70px');
 			$('#tanmu_div').css('visibility', 'visible');
 		}else{
+			
 			$('#tanmu_div').fadeOut();
 		}
-		tag ++;
 	});
 	
 	//获取小车的位置
@@ -549,14 +549,13 @@
 	}
     
     //开启、关闭投票
-	var tou_tag = 0;
 	$('.toupiao').on('click', function(){
-		if(tou_tag % 2 === 0){
-			$('#toupiao_frame').fadeIn();
-		}else{
+		$('#tanmu_div').hide();
+		if($('#toupiao_frame').css('display') !== 'none'){
 			$('#toupiao_frame').fadeOut();
+		}else{
+			$('#toupiao_frame').fadeIn();
 		}
-		tou_tag ++;
 	});
 	
 	
@@ -633,4 +632,5 @@
 		}, 1000);
 	}
 	
+	
 })(window, $);