Skip to content

G
gs1
Commit d4641233 by Tang
Options

Merge remote-tracking branch 'origin/master'

parents 8c183517 0f8027f1
Showing with 120 additions and 37 deletions
src/components/layout/topBanner.vue
......@@ -2,7 +2,6 @@
<div class="container d-none d-xl-block d-lg-block">
<div class="top-banner">
<div>全球商业语言</div>
<div class="top-banner-item tb-hover">咨询电话：400-7000-690</div>
<div class="top-banner-item language">
<el-dropdown class="language-dropdown">
<span class="el-dropdown-link">
......@@ -14,6 +13,7 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="top-banner-item tb-hover">咨询电话：400-7000-690</div>
<div class="top-banner-item">
<img src="../../assets/image/head/wx.png" alt="" />
<a class="tb-hover" target="_blank" href="/gs1cnweixin">官方微信</a>
......
src/main.js
......@@ -10,7 +10,7 @@ import "./assets/css/layout.scss";
import "bootstrap/dist/js/bootstrap.min.js";
import "./plugins/element.js";
import "./plugins/qrcode.js";
// import "./assets/css/element-variables.scss";
import "./assets/css/element-variables.scss";
import GsTable from './components/table/index'
// 百度地图
......
src/views/Business/Fap.vue
......@@ -192,10 +192,12 @@ export default {
.nav-link {
border: 0;
color: #454545;
font-size: 15px;
&.active,
&:hover {
border-bottom: 3px solid #f26335;
color: #04408d;
font-weight: bold;
}
}
}
......
src/views/Business/Notice.vue
......@@ -119,10 +119,12 @@ export default {
.nav-link {
border: 0;
color: #454545;
font-size: 15px;
&.active,
&:hover {
border-bottom: 3px solid #f26335;
color: #04408d;
font-weight: bold;
}
}
}
......
src/views/Business/copms/list.vue
......@@ -24,6 +24,8 @@ export default {
border-bottom: 1px dashed #c5d8ee;
padding: 20px 0;
margin: 0;
font-size: 14px;
color: #454545;
.list-left {
flex: 1;
display: flex;
......
src/views/Business/copms/table.vue
......@@ -46,6 +46,7 @@ export default {
padding: 20px 0;
margin: 0;
border-bottom: 1px solid #E9E9E9;
font-size: 13px;
}
}
}
......
src/views/Home/comps/list.vue
<template>
<div class="list">
<div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
<div class="col-lg-8 list-left">
<div class="col-lg-10 list-left">
<span></span>
<span>{{tmp.title}}</span>
</div>
<div class="col-lg-4 list-right">{{tmp.time}}</div>
<div class="col-lg-2 list-right">{{tmp.time}}</div>
</div>
<div class="row">
<div class="col">
......@@ -36,7 +36,7 @@ export default {
.row {
display: flex;
justify-content: space-between;
padding: 8px 0;
padding: 11px 0;
margin: 0;
cursor: pointer;
.list-left {
......@@ -72,17 +72,27 @@ export default {
height: 35px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
background: #F26335;
border-radius: 4px;
position: relative;
&:hover{
background: #A82C04;
img{
right: 14px;
}
}
span{
color: #fff;
font-size: 14px;
margin-left: 20px;
// font-family: PingFangSC-Regular, PingFang SC;
}
img{
margin-left: 10px;
position: absolute;
right: 20px;
top: 50%;
transform: translateY(-50%);
}
}
}
......
src/views/Home/index.vue
......@@ -7,19 +7,19 @@
<div class="banner-item">
<div class="container">
<div class="row">
<div class="col-lg-8 carousel-caption-left">
<div class="col-lg-7 carousel-caption-left">
<div class="carousel-title">{{ el.title }}</div>
<p class="carousel-note">
{{ el.brief }}
</p>
<button class="carousel-btn" @click="learnMore(i)">
了解更多<img
<span>了解更多</span><img
src="../../assets/image/home/more-arrow.png"
alt=""
/>
</button>
</div>
<div class="col-4 carousel-caption-right d-lg-block">
<div class="col-5 carousel-caption-right d-lg-block">
<img :src="el.picIndexPath" alt="" />
</div>
</div>
......@@ -29,7 +29,6 @@
<template #prevArrow>
<div class="custom-arrow"></div>
</template>
<template #customPaging>
<div class="custom-dot"></div>
</template>
......@@ -39,7 +38,7 @@
</VueSlickCarousel>
</div>
<!-- 要闻、中心、地方、国际 -->
<div class="bgWhite padding40">
<div class="bgWhite ywzxdfgj">
<div class="container">
<div class="row">
<div class="col-lg-6">
......@@ -360,10 +359,10 @@
</div>
</div>
<div class="spqqsfz-cont row">
<div class="spqqsfz-cont-left col-lg-3">
<img :src="spqqsfz.surl" alt="" />
<div class="spqqsfz-cont-left col-lg-2">
<div class="spqqsfz-cont-left-tp"><img :src="spqqsfz.surl" alt="" /></div>
</div>
<div class="spqqsfz-cont-right col-lg-9">
<div class="spqqsfz-cont-right col-lg-10">
<!-- <img src="../../assets/image/home/spqqsfz-bj2.png" alt="" /> -->
<div class="right-cont">
<div class="row">
......@@ -383,7 +382,7 @@
<div class="row">
<div class="col offset-2 offset-lg-3">
<button class="spqqsfz-btn" @click="spqqsfzHandelClick">
更多商品信息<img
<span>更多商品信息</span><img
src="../../assets/image/home/more-arrow.png"
alt=""
/>
......@@ -1009,8 +1008,10 @@ export default {
},
// 商品全球身份证
async homeNewGtin() {
console.log(process.env, 'process.env');
this.$http.get(`${process.env.VUE_APP_GDS_URL}/Data/NewGtin`).then((res) => {
console.log(process.env, "process.env");
this.$http
.get(`${process.env.VUE_APP_GDS_URL}/Data/NewGtin`)
.then((res) => {
res.body.murl = `http://data-studio.gds.org.cn/${res.body.murl}`;
res.body.surl = `http://data-studio.gds.org.cn/${res.body.surl}`;
this.spqqsfz = res.body;
......@@ -1208,12 +1209,18 @@ export default {
.slick-arrow {
margin: 0 10px;
&.slick-prev {
top: auto;
bottom: 25px;
transform: translate(0, 0);
&::before {
width: 10px;
height: 18px;
}
}
&.slick-next {
top: auto;
bottom: 25px;
transform: translate(0, 0);
&::before {
width: 10px;
height: 18px;
......@@ -1222,9 +1229,13 @@ export default {
}
.slick-dots {
bottom: 25px !important;
display: flex;
align-items: center;
justify-content: center;
height: 20px;
li {
width: 8px;
height: 8px;
width: 10px;
height: 10px;
&.slick-active {
.custom-dot {
background: #ffffff;
......@@ -1272,6 +1283,8 @@ export default {
}
.smallImages {
.slick-arrow {
width: 24px;
height: 50px;
margin: 0 10px;
&.slick-prev {
&::before {
......@@ -1291,9 +1304,20 @@ export default {
@media screen and (min-width: 992px) {
.banner {
.carousel-title {
font-size: 50px;
font-size: 36px;
line-height: 60px;
}
.slick-arrow {
&.slick-prev {
left: 44%;
}
&.slick-next {
right: 44%;
}
}
}
.ywzxdfgj{
padding: 30px 0;
}
.dzfwDialog-width {
width: 980px;
......@@ -1304,13 +1328,19 @@ export default {
width: auto;
}
.newsBanner {
height: 450px !important;
width: 90.5%;
height: 431px !important;
}
.home-bottom-cont {
> div {
width: 24.4%;
}
}
.spqqsfz-cont-left{
.spqqsfz-cont-left-tp{
position: absolute;
}
}
}
@media screen and (max-width: 992px) {
.banner {
......@@ -1344,9 +1374,9 @@ export default {
.banner {
height: 420px;
position: relative;
background: #f26335;
.banner-item {
height: 100%;
background: #f26335;
.container,
.row {
height: 100%;
......@@ -1369,20 +1399,32 @@ export default {
height: 37px;
display: flex;
align-items: center;
justify-content: center;
background: #0e2c6b;
border-radius: 4px;
font-size: 16px;
color: #ffffff;
position: relative;
span{
margin-left: 18px;
}
&:hover{
background: #061A4D;
img{
right: 10px;
}
}
img {
margin-left: 10px;
position: absolute;
right: 15px;
top: 50%;
transform: translateY(-50%);
}
}
}
.carousel-caption-right {
display: none;
img {
// width: 100%;
width: 100%;
height: 100%;
}
}
......@@ -1431,6 +1473,7 @@ export default {
display: flex;
align-items: center;
flex: 1;
justify-content: center;
}
}
}
......@@ -1552,8 +1595,12 @@ export default {
text-align: center;
}
.ywdt-tp {
margin-bottom: 20px;
margin-bottom: 14px;
cursor: pointer;
height: 38px;
display: flex;
align-items: center;
justify-content: center;
}
.ywdt-bt {
color: #0e2c6b;
......@@ -1599,17 +1646,23 @@ export default {
.dzfw-border {
text-align: center;
// padding: 25px 0;
height: 133px;
height: 134.8px;
display: flex;
flex-direction: column;
justify-content: center;
border-top: 1px solid #f0f5fa;
}
.dzfw-tp{
height: 40px;
display: flex;
align-items: center;
justify-content: center;
}
.dzfw-bt {
width: 100px;
font-size: 12px;
width: 120px;
font-size: 14px;
margin: 0 auto;
margin-top: 20px;
margin-top: 14px;
// font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #0e2c6b;
......@@ -1691,7 +1744,7 @@ export default {
position: absolute;
left: 0;
top: 0;
width: 100%;
width: 95.4%;
height: 100%;
display: flex;
flex-direction: column;
......@@ -1724,13 +1777,25 @@ export default {
height: 41px;
display: flex;
align-items: center;
justify-content: center;
background: #061a4d;
background: #0E2C6B;
border-radius: 4px;
color: #fff;
font-size: 18px;
position: relative;
span{
margin-left: 18px;
}
&:hover{
background: #061a4d;
img{
right: 10px;
}
}
img {
margin-left: 10px;
position: absolute;
right: 14px;
top: 50%;
transform: translateY(-50%);
}
}
}
......
src/views/comps/cate.vue
......@@ -17,10 +17,11 @@ export default {
</script>
<style lang="scss">
.zxcxgj-cate {
font-size: 16px;
color: #04408d;
font-size: 18px;
color: #454545;
border-bottom: 1px solid #c5d8ee;
padding: 14px 0;
font-weight: bold;
>div {
display: flex;
align-items: center;
......
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