Skip to content

Commit addcd09

Browse files
author
hongwei
committed
fix map info
1 parent 90c1527 commit addcd09

File tree

9 files changed

+61
-27
lines changed

9 files changed

+61
-27
lines changed

_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
1414
# You can create any custom variable you would like, and they will be accessible
1515
# in the templates via {{ site.myvariable }}.
16-
title: Business Jekyll Theme
16+
title: Oriental Horizon Hotel Services
1717
1818
description: > # this means to ignore newlines until "baseurl:"
1919
Yet another Jekyll theme. It is designed for business purpose and ported by

_includes/header.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<a href="/about.html">About</a>
2323
</li>
2424
<li>
25-
<a href="/blog.html">Blog</a>
25+
<a href="/service.html">Service</a>
26+
</li>
27+
<li>
28+
<a href="/news.html">News</a>
2629
</li>
2730
<li>
2831
<a href="/team.html">Team</a>

_includes/script.html

+37-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,41 @@
22
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
33
<script src="../js/wow.min.js"></script>
44
<script>
5-
new WOW().init();
5+
new WOW().init();
6+
// // 百度地图API功能
7+
// var map = new BMap.Map("map_container"); // 创建Map实例
8+
// map.centerAndZoom(new BMap.Point(116.404, 39.915), 11); // 初始化地图,设置中心点坐标和地图级别
9+
// //添加地图类型控件
10+
// map.addControl(new BMap.MapTypeControl({
11+
// mapTypes:[
12+
// BMAP_NORMAL_MAP,
13+
// BMAP_HYBRID_MAP
14+
// ]}));
15+
// map.setCurrentCity("北京"); // 设置地图显示的城市 此项是必须设置的
16+
// map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
17+
18+
function loadJScript() {
19+
var script = document.createElement('script');
20+
script.type = 'text/javascript';
21+
script.src = '//api.map.baidu.com/api?type=webgl&v=1.0&ak=oZ5ONlBBSuVIrz7WWdHdaw4g1zYOB3G6&callback=init';
22+
document.body.appendChild(script);
23+
}
24+
25+
function init() {
26+
var map = new BMapGL.Map('map_container'); // 创建Map实例
27+
var point = new BMapGL.Point(116.465808, 39.91327); // 创建点坐标
28+
// var icon = new BMapGL.Icon("http://app.baidu.com/map/images/us_mk_icon.png", new BMap.Size(json.w,json.h);
29+
map.centerAndZoom(point, 18);
30+
map.enableScrollWheelZoom(); // 启用滚轮放大缩小
31+
32+
var marker = new BMapGL.Marker(point, {
33+
enableDragging: true
34+
});
35+
// var icon = new BMapGL.Icon("assets/img/slider/sign-310036_1280.png", new BMapGL.Size(50, 30));
36+
// var marker = new BMapGL.Marker(point, {
37+
// icon: icon
38+
// });
39+
map.addOverlay(marker);
40+
}
41+
window.onload = loadJScript; // 异步加载地图
642
</script>

_layouts/home_style.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h3 class="services-header-title">Our Mission</h3>
7777
</div>
7878

7979
<!-- Begin Services Row 1 -->
80-
<div class="row services-row services-row-head services-row-1">
80+
<div hidden="true" class="row services-row services-row-head services-row-1">
8181
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
8282
<div class="services-group wow animated fadeInLeft" data-wow-offset="40">
8383
<p class="services-icon"><span class="fa fa-android fa-5x"></span></p>
@@ -108,7 +108,7 @@ <h4 class="services-title">EASY TO USE</h4>
108108
<!-- End Serivces Row 1 -->
109109

110110
<!-- Begin Services Row 2 -->
111-
<div class="row services-row services-row-tail services-row-2">
111+
<div hidden="true" class="row services-row services-row-tail services-row-2">
112112
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
113113
<div class="services-group wow animated fadeInLeft" data-wow-offset="40">
114114
<p class="services-icon"><span class="fa fa-windows fa-5x"></span></p>

assets/css/style.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ License URI:http://www.gnu.org/licenses/gpl-2.0.html
5353
margin-left: auto;
5454
}
5555

56-
.container-map {
56+
#map_container {
5757
overflow: hidden;
5858
width: 100%;
59-
height: 100%;
59+
height: 500px;
6060
margin: 0;
6161
font-family: "微软雅黑";
6262
}

contact.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<div class="row">
1010
<div>
1111
<!-- <iframe width="100%" height="450px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="{{ site.google_map }}"></iframe>-->
12-
<iframe width="100%" height="450px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" href="/map.html"></iframe>
12+
<!-- <iframe id="map_container1" width="100%" height="450px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" onload="iwnit()"></iframe>-->
13+
<div id="map_container" onload="init()"></div>
1314
<br />
1415
</div>
1516
<div class="container">

map.html

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
11
---
22
layout: default_style
33
permalink: /map
4-
published: true
54
---
65
<!-- Main Container -->
7-
<script>
8-
function loadJScript() {
9-
var script = document.createElement('script');
10-
script.type = 'text/javascript';
11-
script.src = '//api.map.baidu.com/api?type=webgl&v=1.0&ak=oZ5ONlBBSuVIrz7WWdHdaw4g1zYOB3G6&callback=init';
12-
document.body.appendChild(script);
13-
}
14-
function init() {
15-
var map = new BMapGL.Map('container'); // 创建Map实例
16-
var point = new BMapGL.Point(116.465, 39.913); // 创建点坐标
17-
map.centerAndZoom(point, 10);
18-
map.enableScrollWheelZoom(); // 启用滚轮放大缩小
19-
}
20-
window.onload = loadJScript; // 异步加载地图
21-
</script>
22-
<div id="container"></div>
23-
6+
<div id="map_container" onload="init()"></div>
247
<!--End Main Container -->

blog.html news.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default_style
3-
permalink: /blog
3+
permalink: /news
44
published: true
55
---
66
<!-- Main Container -->

service.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
layout: default_style
3+
permalink: /service
4+
published: true
5+
---
6+
<!-- Main Container -->
7+
<div id="banners"></div>
8+
<div class="container">
9+
<p><h1>Services</h1></p>
10+
</div>
11+
<!--End Main Container -->

0 commit comments

Comments
 (0)