add new icon

2026-08-05 06:23:38 +00:00 · 2015-08-04 13:07:01 +08:00
parent 7d2f66a0fb
commit 8b04c504dc
6 changed files with 2082 additions and 29 deletions
@@ -156,7 +156,7 @@ body{
 	left:10px;
 	top:70px;
 	opacity: 0.9;
-	height:300px;
+	min-height:330px;
 	width:190px;
 	border:1px solid #ddd;
 }
@@ -177,6 +177,10 @@ body{
 	color: #0091FF;
 }

+#charts_info_address{
+	font-size:14px;
+}
+
 .timeline_pannel{
 	position:absolute;
 	top:70px;
@@ -284,5 +288,3 @@ body{



-
-
@@ -10,7 +10,7 @@
 	<meta name="misapplication-tap-highlight" content="no"/>
 	<title>美途</title> 
 	<link type="text/css" rel="stylesheet"  href="css/main.css"/>
-	
+	<link type="text/css" rel="stylesheet"  href="css/font-awesome.css"/>
 </head>
 <body>
 	<div id="map" ></div>
@@ -47,6 +47,10 @@
 	    		<div>距离：<span id="real_distance" style="font-size:15px;color:#E6007C;font-weight:bold;">计算中</span></div>
 	    		<div>时长：<span id="real_distime" style="font-size:15px;color:#E6007C;font-weight:bold;">计算中</span></div>
    		</div>
+    		<div>
+    			<span class="fa fa-map-marker" style="color:red;margin-left:5px;margin-top:5px;"></span>
+    			<span id="charts_info_address" style="color:#EA0085;margin-right:3px;font-weight:bold;">计算中</span>
+    		</div>
    		<div style="width:100%;">
    			<div id="tem_yin" class="fl tempe" style="color:#FF5718;">阴</div>
    			<div id="tem_du" class="fl tempe" style="color: #4C4C4C;">23</div>
@@ -68,14 +72,17 @@
    		<div id="timeline_item_1"></div>
    </div>
 	<div class="toolbar">
-		<div class="car_run car_run_show">
-			行
+		<!--<div class="car_run car_run_show">
+			行
+		</div>-->
+		<div class="car_run toupiao" style="background-color:#00C348;">
+			投
 		</div>
 		<div class="car_run danmu" style="background-color:#E82D00;">
 			弹
 		</div>
-		<div class="car_run toupiao" style="background-color:#00C348;">
-			投
+		<div class="car_run car_run_show">
+			<i class="fa fa-info" style="font-size:17px;"></i>
 		</div>
 	</div>
 	<!--	描述：iframe万能框-->
@@ -2,39 +2,44 @@
 	
 	window.routes1 = [
 		{
-			x: 121.456604,
-			y: 31.23394,
+			x: 121.352921,
+			y: 31.252139,
 			content: '上海',
 			startTime: '8:00'
 		},
 		{
-			x: 121.14212,
-			y: 31.264466,
+			x: 120.986375,
+			y: 31.335728,
+			content: '昆山'
+		},
+		{
+			x: 120.594682,
+			y: 31.34791,
 			content: '苏州'
 		},
 		{
-			x: 120.632629,
-			y: 31.28794,
+			x: 120.333252,
+			y: 31.632337,
 			content: '无锡'
 		},
 		{
-			x: 120.2742,
-			y: 31.582045,
+			x: 119.946671,
+			y: 31.853648,
 			content: '常州'
 		},
 		{
-			x: 119.943237,
-			y: 31.771375,
+			x: 119.53331,
+			y: 32.044169,
 			content: '丹阳'
 		},
 		{
-			x: 119.409027,
-			y: 32.196533,
+			x: 119.373322,
+			y: 32.198276,
 			content: '镇江'
 		},
 		{
-			x: 119.393921,
-			y: 32.41011,
+			x: 119.4104,
+			y: 32.393298,
 			content: '扬州'
 		}
 	];
@@ -35,7 +35,6 @@
 	    AMap.service(['AMap.Weather'], function(){
 	    		var we = new AMap.Weather();
 	    		we.getLive(routes[routes.length - 1].content, function(err, status){
-	    			console.log(status);
 	    			$('#tem_yin').text(status.weather);
 	    			$('#tem_du').text(status.temperature + '℃');
 	    			$('#tem_feng').text(status.windDirection + '风');
@@ -347,7 +346,7 @@
 		styles += ' ._in_story{font-size:13px;margin-left:5px;line-height:16px;margin-top:5px;}';
 		styles += ' ._in_arrow_down{border:1px solid #ddd;width:12px;height:12px;background-color:#fff;margin-left:auto;margin-right:auto;';
 		styles += 'transform:rotate(45deg);-ms-transform:rotate(45deg);-moz-transform:rotate(45deg);';
-		styles += '-webkit-transform:rotate(45deg);-o-transform:rotate(45deg);border-left:0;border-top:0;margin-top:3px;}';
+		styles += '-webkit-transform:rotate(45deg);-o-transform:rotate(45deg);border-left:0;border-top:0;margin-top:0px;}';
 		styles += ' a{text-decoration:none;color:#484848;} a:hover{color:#484848;}';
 		styles += '</style>';
 		
@@ -373,11 +372,11 @@
 		contentHTML += '</div><div style="float:right;" class="_in_city_story">';
 		contentHTML += '<img src="' + pics[picIndex] + '"/></div></div>';
 		contentHTML += '<div class="_in_story">';
-		contentHTML += '<div><a target="_blank" href="' + urls[0] +'">那座城市，那个人， 特价<span style="color:red;font-size:14px;margin">¥899</span></a></div>';
-		contentHTML += '<div><a target="_blank" href="' + urls[1] +'">再美不如苏州园林， 门票：¥40</a></div>';
-		contentHTML += '<div><a target="_blank" href="' + urls[2] +'">苏州好吃一窝，特价团购：¥30</a></div>';
-		contentHTML += '<div><a target="_blank" href="' + urls[3] +'">苏州必须去的5个景点，去了才知道</a></div>';
-		contentHTML += '<div><a target="_blank" href="' + urls[4] +'">假日酒店，全家人旅行特选，机场接送</a></div></div>';
+		contentHTML += '<div><a target="_blank" href="' + urls[0] +'"><i style="color:#00C348;" class="fa fa-star"></i> 那座城市，那个人， 特价 <span style="color:red;font-size:14px;margin"><i class="fa fa-jpy"></i> 899</span></a></div>';
+		contentHTML += '<div><a target="_blank" href="' + urls[1] +'"><i style="color:#00C348;" class="fa fa-star"></i> 再美不如苏州园林， 门票：<span style="color:red;font-size:14px;margin"><i class="fa fa-jpy"></i> 40</span></a></div>';
+		contentHTML += '<div><a target="_blank" href="' + urls[2] +'"><i style="color:#00C348;" class="fa fa-star"></i> 苏州好吃一窝，特价团购：<span style="color:red;font-size:14px;margin"><i class="fa fa-jpy"></i> 50</span></a></div>';
+		contentHTML += '<div><a target="_blank" href="' + urls[3] +'"><i style="color:#00C348;" class="fa fa-star"></i> 苏州必须去的5个景点，去了才知道</a></div>';
+		contentHTML += '<div><a target="_blank" href="' + urls[4] +'"><i style="color:#00C348;" class="fa fa-star"></i> 假日酒店，全家人旅行特选，机场接送</a></div></div>';
 		contentHTML += '<div class="_in_arrow_down"></div></div>';
 		return contentHTML;
 	}
@@ -511,6 +510,21 @@
    				$('#real_distance').text(getAllDistance() + 'km');
 			}
 			
+			if(carMarker){
+				var pos = carMarker.getPosition();
+				AMap.service(["AMap.Geocoder"], function(){
+					var geocoder = new AMap.Geocoder();
+					geocoder.getAddress(pos, function(status, result){
+						if(status === 'error' || status === 'no_data') {
+			                console.log("geocoder error");
+			            }else {
+			            		var address = result.regeocode.formattedAddress;
+			            		$('#charts_info_address').text(address);			            
+			            }
+					});
+				});
+			}
+			
 		}, 1000);		
 	}