This commit is contained in:
lh_wang
2015-08-02 09:14:56 +08:00
parent c9bd0847df
commit f85afdce4e
22 changed files with 3689 additions and 17 deletions
+3 -3
View File
@@ -77,11 +77,11 @@
</div>
</div>
<div id="tanmu_div" style="visibility:hidden;border:0;position:absolute;left:0;right:0;height:194px;bottom:0;z-index:10000;box-sizing: border-box;background-color:#F6F6F6;">
<iframe scrolling="no" style="width:100%;height:40px;border:0;opacity:0.5;" src="http://localhost:3000/"></iframe>
<iframe scrolling="no" style="width:100%;height:152px;border:0;margin-top:-2px;" src="http://localhost:3000/emit"></iframe>
<iframe scrolling="no" style="width:100%;height:40px;border:0;opacity:0.5;" src="http://123.57.39.116:9797/"></iframe>
<iframe scrolling="no" style="width:100%;height:152px;border:0;margin-top:-2px;" src="http://123.57.39.116:9797/emit"></iframe>
</div>
<div id="toupiao_frame" style="display:none;width:350px;height:600px;position:absolute;right:70px;top:70px;background-color:#fff;border:0;">
<iframe src="http://localhost:3000/toupiao/index.html" style="width:100%;height:600px;border:0;"></iframe>
<iframe src="http://123.57.39.116:9797/toupiao/index.html" style="width:100%;height:600px;border:0;"></iframe>
</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>
+15 -14
View File
@@ -27,6 +27,16 @@
});
$('.search_btn').on('click', function(e){
//天气
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 + '风');
});
});
map.clearMap();
map.setZoom(13);
$('.timeline').empty();
@@ -347,11 +357,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 href="' + urls[0] +'">那座城市,那个人, 特价¥899</a></div>';
contentHTML += '<div><a href="' + urls[1] +'">再美不如苏州园林, 门票:¥40</a></div>';
contentHTML += '<div><a href="' + urls[2] +'">苏州好吃一窝,特价团购:¥30</a></div>';
contentHTML += '<div><a href="' + urls[3] +'">苏州必须去的5个景点,去了才知道</a></div>';
contentHTML += '<div><a href="' + urls[4] +'">假日酒店,全家人旅行特选,机场接送</a></div></div>';
contentHTML += '<div><a target="_blank" href="' + urls[0] +'">那座城市,那个人, 特价¥899</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 class="_in_arrow_down"></div></div>';
return contentHTML;
}
@@ -477,15 +487,6 @@
}, 1000);
}
AMap.service(['AMap.Weather'], function(){
var we = new AMap.Weather();
we.getLive(routes[routes.length - 1].content, function(err, status){
$('#tem_yin').text(status.weather);
$('#tem_du').text(status.temperature + '℃');
$('#tem_feng').text(status.windDirection + '风');
});
});
//开启、关闭弹幕
var tou_tag = 0;
$('.toupiao').on('click', function(){