Skip to content

G
gs1
Commit df4760e5 by tang
Options

Merge remote-tracking branch 'origin/master'

parents beef2211 9e663f56
Showing with 111 additions and 92 deletions
src/assets/css/englishComm.scss
.englishToolkit { .englishToolkit {
.slick-dots { .arousel-glyph {
bottom: 25px !important; margin-top: -40px;
display: flex; }
align-items: center;
justify-content: center; .slick-dots {
height: 20px; bottom: 25px !important;
display: flex;
li { align-items: center;
width: 10px; justify-content: center;
height: 10px; height: 20px;
&.slick-active { li {
.custom-dot { width: 10px;
background: #ffffff; height: 10px;
opacity: 1;
} &.slick-active {
}
.custom-dot { .custom-dot {
border-radius: 50%; background: #ffffff;
width: 100%; opacity: 1;
height: 100%;
background: #fff;
line-height: 1;
padding: 0;
opacity: 0.5;
} }
} }
.custom-dot {
border-radius: 50%;
width: 100%;
height: 100%;
background: #fff;
line-height: 1;
padding: 0;
opacity: 0.5;
}
} }
} }
\ No newline at end of file }
\ No newline at end of file
src/views/English/Home/index.vue
...@@ -6,12 +6,8 @@ ...@@ -6,12 +6,8 @@
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item bg-peach next left"> <div class="item bg-peach next left">
<div class="container"> <div class="container">
<img <img class="pull-right carousel-glyph" src="@/assets/image/english/GS1-China.jpg" style="margin-top:-40px"
class="pull-right carousel-glyph" alt="Placeholder" />
src="@/assets/image/english/GS1-China.jpg"
style="margin-top: -40px"
alt="Placeholder"
/>
<h1>About GS1 China</h1> <h1>About GS1 China</h1>
<p class="large"> <p class="large">
GS1 China, founded in 1988 under the authorization of the State GS1 China, founded in 1988 under the authorization of the State
...@@ -23,21 +19,16 @@ ...@@ -23,21 +19,16 @@
</p> </p>
<a @click="handleGo('SecondaryMenu/Introduction')"> <a @click="handleGo('SecondaryMenu/Introduction')">
<button type="button" class="btn-primary btn-margin bg-blue"> <button type="button" class="btn-primary btn-margin bg-blue">
More About GS1 China More About GS1 China0000
</button></a </button></a>
>
</div> </div>
</div> </div>
</div> </div>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item bg-purple"> <div class="item bg-purple">
<div class="container"> <div class="container">
<img <img class="pull-right carousel-glyph" src="@/assets/image/english/carousel-1.jpg"
class="pull-right carousel-glyph" style="margin-top:-40px" alt="Placeholder" />
src="@/assets/image/english/carousel-1.jpg"
style="margin-top: -40px"
alt="Placeholder"
/>
<h1>About GS1</h1> <h1>About GS1</h1>
<p class="large"> <p class="large">
GS1 believes in the power of standards to transform the way we GS1 believes in the power of standards to transform the way we
...@@ -47,20 +38,15 @@ ...@@ -47,20 +38,15 @@
<a href="http://www.gs1.org/about" target="_blank"> <a href="http://www.gs1.org/about" target="_blank">
<button type="button" class="btn-primary btn-margin bg-blue"> <button type="button" class="btn-primary btn-margin bg-blue">
More About GS1 More About GS1
</button></a </button></a>
>
</div> </div>
</div> </div>
</div> </div>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item bg-lime"> <div class="item bg-lime">
<div class="container"> <div class="container">
<img <img class="pull-right carousel-glyph" src="@/assets/image/english/training.jpg" style="margin-top:-40px"
class="pull-right carousel-glyph" alt="Placeholder" />
src="@/assets/image/english/training.jpg"
style="margin-top: -40px"
alt="Placeholder"
/>
<h1>Training</h1> <h1>Training</h1>
<p class="large"> <p class="large">
GS1 offers a wide range of training courses to help you use our GS1 offers a wide range of training courses to help you use our
...@@ -77,20 +63,15 @@ ...@@ -77,20 +63,15 @@
<a href="http://www.gs1.org/training" target="_blank"> <a href="http://www.gs1.org/training" target="_blank">
<button type="button" class="btn-primary btn-margin bg-blue"> <button type="button" class="btn-primary btn-margin bg-blue">
View More View More
</button></a </button></a>
>
</div> </div>
</div> </div>
</div> </div>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item bg-sky left"> <div class="item bg-sky left">
<div class="container"> <div class="container">
<img <img class="pull-right carousel-glyph" src="@/assets/image/english/local.jpg" style="margin-top:-40px"
class="pull-right carousel-glyph" alt="Placeholder" />
src="@/assets/image/english/local.jpg"
style="margin-top: -40px"
alt="Placeholder"
/>
<h1>Contact GS1 local offices</h1> <h1>Contact GS1 local offices</h1>
<p class="large"> <p class="large">
GS1 has local offices in over 100 countries. Our local offices GS1 has local offices in over 100 countries. Our local offices
...@@ -111,8 +92,7 @@ ...@@ -111,8 +92,7 @@
<a href="http://www.gs1.org/contact/overview" target="_blank"> <a href="http://www.gs1.org/contact/overview" target="_blank">
<button type="button" class="btn-primary btn-margin bg-blue"> <button type="button" class="btn-primary btn-margin bg-blue">
View More View More
</button></a </button></a>
>
</div> </div>
</div> </div>
</div> </div>
...@@ -144,12 +124,12 @@ import trodList from "./components/trodList"; ...@@ -144,12 +124,12 @@ import trodList from "./components/trodList";
import columnFourList from "./components/columnFourList"; import columnFourList from "./components/columnFourList";
export default { export default {
components: { VueSlickCarousel, columnFourList, trodList }, components: { VueSlickCarousel, columnFourList, trodList },
data() { data () {
return { return {
banner: [], // 首页大轮播图 banner: [], // 首页大轮播图
bannerSettings: { bannerSettings: {
arrows: true, arrows: true,
autoplay: true, autoplay: false,
autoplaySpeed: 4000, autoplaySpeed: 4000,
dots: true, dots: true,
centerMode: true, centerMode: true,
...@@ -160,7 +140,7 @@ export default { ...@@ -160,7 +140,7 @@ export default {
}; };
}, },
methods: { methods: {
handleGo(val) { handleGo (val) {
this.$router.push({ path: val }); this.$router.push({ path: val });
}, },
}, },
......
src/views/English/SecondaryMenu/ContactUs.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ul class="nav navbar-nav mm-float1"> <ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4"> <ol class="breadcrumb" style="background-color: #f4f4f4">
<li><a @click="handleGo('/EnglishHome')">Home</a></li> <li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Contact Us</li> <li class="active">Contact Us</li>
</ol> </ol>
...@@ -17,42 +17,58 @@ ...@@ -17,42 +17,58 @@
<section> <section>
<div class="row"> <div class="row">
<div class="col-sm-9"> <div class="col-sm-9">
<h1 style="margin-bottom:35px">Contact Us</h1> <h1 style="margin-bottom: 35px">Contact Us</h1>
<div class="content-module-wrapper" style="border-top: 7px solid #f26334"> </div> <div class="content-module-wrapper" style="border-top: 7px solid #f26334"></div>
<div class="content-module content-module-padding" style="padding: 0px; background-color: #FFF"> <div class="content-module content-module-padding" style="padding: 0px; background-color: #fff">
<div> <div class="map">
地图 <baidu-map class="bm-view" :center="map.center" :zoom="map.zoom" :scroll-wheel-zoom="true">
<bm-overview-map anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :isOpen="true"></bm-overview-map>
<bm-navigation anchor="BMAP_ANCHOR_TOP_LEFT"></bm-navigation>
<bm-label :content="map.label" :position="map.center" :labelStyle="{ borderColor: 'black' }"
:offset="{ width: -48 }" @click="lookDetail" />
<bm-info-window :position="map.center" :show="map.show" @close="infoWindowClose">
<div>中国物品编码中心</div>
<div>
地址：北京市东城区安定门外大街138号皇城国际大厦B座3-6层
</div>
<div>邮编：100011</div>
</bm-info-window>
</baidu-map>
</div> </div>
<h4 style="padding: 20px"> <h4 style="padding: 20px">GS1 China</h4>
GS1 China</h4> <p class="small" style="padding: 20px; padding-bottom: 0px">
<p class="small" style="padding: 20px; padding-bottom:0px"> 3-6 F, Wing B, Imperial International Bldg., No.138 Andingmenwai
3-6 F, Wing B, Imperial International Bldg., No.138 Andingmenwai Street, Dongcheng Street, Dongcheng District, Beijing 100011, P.R.China
District, Beijing 100011, P.R.China</p> </p>
<p class="small" style="padding: 20px"> <p class="small" style="padding: 20px">
Tel: (+86) 400-7000-690<br> Tel: (+86) 400-7000-690<br />
E-mail: <a href="Mailto:info@ancc.org.cn">info@ancc.org.cn</a><br> E-mail: <a href="Mailto:info@ancc.org.cn">info@ancc.org.cn</a><br />
Webside:<a href="http://www.gs1cn.org/" target="_blank">www.gs1cn.org</a></p> Webside:<a href="http://www.gs1cn.org/" target="_blank">www.gs1cn.org</a>
</p>
</div> </div>
</div> </div>
<div class="col-sm-3" style="padding-top:59px"> <div class="col-sm-3" style="padding-top: 59px">
<div class="content-module-container"> <div class="content-module-container">
<h4> </h4> <h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"> <div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
</div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
<h4>Tools</h4> <h4>Tools</h4>
<p class="small"> <p class="small">
<a href="http://www.gs1.org/check-digit-calculator" target="_blank">Check digit calculator</a><br> <a href="http://www.gs1.org/check-digit-calculator" target="_blank">Check digit calculator</a><br />
Calculate correct check digit for barcodes.</p> Calculate correct check digit for barcodes.
</p>
<p class="small"> <p class="small">
<a href="http://gepir.gs1.org" target="_blank">Who owns this barcode?</a><br> <a href="http://gepir.gs1.org" target="_blank">Who owns this barcode?</a><br />
Find companies linked to GS1 barcode numbers.</p> Find companies linked to GS1 barcode numbers.
</p>
</div> </div>
<div class="content-module content-module-padding"> <div class="content-module content-module-padding">
<h4>Standards</h4> <h4>Standards</h4>
<p class="small"> <p class="small">
<a href="http://www.gs1.org/how-gs1-standards-work" target="_blank">See how GS1 standards work</a><br> <a href="http://www.gs1.org/how-gs1-standards-work" target="_blank">See how GS1 standards
GS1 standards help you single out what really matters.</p> work</a><br />
GS1 standards help you single out what really matters.
</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -63,16 +79,36 @@ ...@@ -63,16 +79,36 @@
</template> </template>
<script> <script>
export default { export default {
data() { data () {
return {}; return {
map: {
label: "中国物品编码中心",
center: { lng: 116.415256, lat: 39.961205 },
zoom: 16,
show: false,
},
};
}, },
methods: { methods: {
handleGo(val) { handleGo (val) {
this.$router.push({ path: val }); this.$router.push({ path: val });
}, },
lookDetail () {
this.map.show = true;
},
infoWindowClose () {
this.map.show = false;
},
}, },
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss">
@import "@/assets/css/english"; @import "@/assets/css/english";
.map {
width: 100%;
.bm-view {
width: 100%;
height: 500px;
}
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment