Skip to content

G
gs1
Commit b1b4ce2b by Jianli Ou
Options

Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

parents f863fa9f 372f3003
Showing with 446 additions and 342 deletions
src/assets/css/_mixin.scss
......@@ -291,7 +291,7 @@
border-color: $borderColor;
}
&::placeholder {
color: $placeholderColor;
color: $placeholderColor !important;
}
}
.el-input__icon {
......@@ -332,6 +332,50 @@
}
}
@mixin elDateTimeRange {
.el-date-editor--datetimerange {
&.el-input__inner {
width: 100%;
display: flex;
align-items: center;
height: calcvh(33);
line-height: calcvh(33);
}
}
.el-input__icon {
color: #00ffff;
height: auto;
}
}
@mixin elDate($height: calcvh(33), $color: #00ffff, $placeholderColor: #00ffff) {
.el-date-editor {
&.el-input {
width: 100%;
height: $height;
}
.el-range-input {
background: none;
color: $color;
flex: 1;
font-size: calcvw(14);
&::placeholder {
color: $placeholderColor;
}
}
.el-range-separator {
color: $color;
display: flex;
align-items: center;
width: auto;
font-size: calcvw(14);
}
.el-input__icon {
color: $color;
}
}
}
// 超宽显示省略号
@mixin ellipsis {
overflow: hidden;
......
src/components/layout/header/mock.js
......@@ -550,20 +550,32 @@ export const nav = [
children: [
{
id: uuid("gs_nav"),
name: "全球法人机构识别编码（LEI）业务办理",
name: "跨境业务办理（GLN/LEI/其他）",
index: 2,
link: "/Business/GLN",
link: "",
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/GLN" },
{ name: "全球参与方位置代码（GLN）业务办理" },
{ name: "跨境业务办理（GLN/LEI/其他）" },
],
},
// {
// id: uuid("gs_nav"),
// name: "全球法人机构识别编码（LEI）业务办理",
// index: 2,
// link: "/Business/GLN",
// breadcrumb: [
// { name: "业务大厅", path: "/Business" },
// { name: "办理其他业务", path: "/Business/GLN" },
// { name: "全球参与方位置代码（GLN）业务办理" },
// ],
// },
{
id: uuid("gs_nav"),
name: "全球参与方位置代码（GLN）业务办理",
index: 2,
link: "/Business/GLN",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/GLN" },
......@@ -575,6 +587,7 @@ export const nav = [
name: "办理产品电子代码（EPC）",
index: 2,
link: "/Business/cpdzdm",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/GLN" },
......@@ -586,6 +599,7 @@ export const nav = [
name: "办理资产标识代码",
index: 2,
link: "/Business/GIAI",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/GLN" },
......@@ -597,6 +611,7 @@ export const nav = [
name: "办理全球服务关系代码",
index: 2,
link: "/Business/GSRN",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/GSRN" },
......@@ -608,6 +623,7 @@ export const nav = [
name: "办理动物管理者代码",
index: 2,
link: "/Business/Animalcode",
isHiddenMenu: true,
breadcrumb: [
{ name: "业务大厅", path: "/Business" },
{ name: "办理其他业务", path: "/Business/Animalcode" },
......
src/views/Home/comps/sousuo-list.vue
......@@ -2,7 +2,7 @@
<ul class="sousuoList">
<li v-for="(tmp, i) in 10" :key="i">
<div class="sousuoList-top">
<span>【新闻资讯】山东省条码印刷品质量检验站通过</span>
<span>【资讯动态】山东省条码印刷品质量检验站通过</span>
<span>CNAS评审组现场评审</span>
</div>
<div class="sousuoList-middle">中国合格评定国家认可委员会（CNAS）派遣2名评审员组成评审组就所申请一维条码符号、二维条码符号、行业应用软件、移动智能终端应用软件和移动智能终端应用软件（个人信息安全保护…</div>
......
src/views/Home/index.vue
......@@ -13,11 +13,11 @@
{{ el.brief }}
</p>
<button
:class="['carousel-btn', el.colorMore]"
@click="learnMore(i)"
:class="['carousel-btn', el.colorMore]"
@click="learnMore(i)"
>
<span>了解更多</span
><img src="../../assets/image/home/more-arrow.png" alt=""/>
><img src="../../assets/image/home/more-arrow.png" alt="" />
</button>
</div>
</div>
......@@ -26,7 +26,7 @@
<!-- <img :src="el.picIndexPath" alt="" class="container"/>-->
<!-- </div>-->
<div class="banner-bg">
<img :src="el.picIndexPath" alt=""/>
<img :src="el.picIndexPath" alt="" />
</div>
</div>
</div>
......@@ -48,30 +48,30 @@
<div class="col-lg-6">
<div class="newsBanner">
<VueSlickCarousel
v-bind="newsBannerSettingsA"
v-if="newsBanner.length > 0"
ref="newsBannerA"
:asNavFor="$refs.newsBannerB"
v-bind="newsBannerSettingsA"
v-if="newsBanner.length > 0"
ref="newsBannerA"
:asNavFor="$refs.newsBannerB"
>
<div
class="newsBanner-item"
v-for="el in newsBanner"
:key="el.id"
class="newsBanner-item"
v-for="el in newsBanner"
:key="el.id"
>
<img :src="el.picFile" alt="..." class="newsBanner-tp"/>
<img :src="el.picFile" alt="..." class="newsBanner-tp" />
</div>
</VueSlickCarousel>
<VueSlickCarousel
v-bind="newsBannerSettingsB"
v-if="newsBanner.length > 0"
ref="newsBannerB"
class="newsBannerB"
:asNavFor="$refs.newsBannerA"
v-bind="newsBannerSettingsB"
v-if="newsBanner.length > 0"
ref="newsBannerB"
class="newsBannerB"
:asNavFor="$refs.newsBannerA"
>
<div
class="newsBanner-item"
v-for="el in newsBanner"
:key="el.id"
class="newsBanner-item"
v-for="el in newsBanner"
:key="el.id"
>
<div class="newsBanner-title" :title="el.title">
{{ el.title }}
......@@ -89,21 +89,21 @@
<div class="col-lg-6">
<ul class="nav nav-tabs tabs1" id="myTab" role="tablist">
<li
class="nav-item"
role="presentation"
v-for="(tmp, i) in news"
:key="i"
@click="handelNewsTab(i)"
class="nav-item"
role="presentation"
v-for="(tmp, i) in news"
:key="i"
@click="handelNewsTab(i)"
>
<button
:class="['nav-link', { active: i === 0 }]"
:id="tmp.type + '-tab'"
data-bs-toggle="tab"
:data-bs-target="'#' + tmp.type"
type="button"
role="tab"
:aria-controls="tmp.type"
aria-selected="true"
:class="['nav-link', { active: i === 0 }]"
:id="tmp.type + '-tab'"
data-bs-toggle="tab"
:data-bs-target="'#' + tmp.type"
type="button"
role="tab"
:aria-controls="tmp.type"
aria-selected="true"
>
<span>{{ tmp.name }}</span>
</button>
......@@ -111,11 +111,11 @@
</ul>
<div class="tab-content marginTop10">
<div
class="tab-pane fade show active"
role="tabpanel"
aria-labelledby="yaowen-tab"
class="tab-pane fade show active"
role="tabpanel"
aria-labelledby="yaowen-tab"
>
<list :list="news[0].data"/>
<list :list="news[0].data" />
</div>
</div>
</div>
......@@ -139,13 +139,13 @@
</button>
<div class="row ywdt-kj whbsxtcy-row">
<div
class="col-6"
v-for="(tmp, i) in whbsxtcy"
:key="i"
@click="whbsxtcyHandelClick(i)"
class="col-6"
v-for="(tmp, i) in whbsxtcy"
:key="i"
@click="whbsxtcyHandelClick(i)"
>
<div class="ywdt-tp">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="ywdt-bt">{{ tmp.name }}</div>
</div>
......@@ -158,13 +158,13 @@
</div>
<div class="row ywdt-kj wsxtcy-row">
<div
class="col-6"
v-for="(tmp, i) in wsxtcy"
:key="i"
@click="wsxtcyHandelClick(i)"
class="col-6"
v-for="(tmp, i) in wsxtcy"
:key="i"
@click="wsxtcyHandelClick(i)"
>
<div class="ywdt-tp">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="ywdt-bt">{{ tmp.name }}</div>
</div>
......@@ -178,13 +178,13 @@
</div>
<div class="row ywdt-kj wsylqy-row">
<div
class="col-6"
v-for="(tmp, i) in wsylqy"
:key="i"
@click="wsylqyHandelClick(i)"
class="col-6"
v-for="(tmp, i) in wsylqy"
:key="i"
@click="wsylqyHandelClick(i)"
>
<div class="ywdt-tp">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="ywdt-bt">{{ tmp.name }}</div>
</div>
......@@ -194,19 +194,26 @@
<div class="ywdt-cate ywdt-cate-bj2">
<span>跨境业务办理专区</span>
</div>
<div class="row ywdt-kj kjywblzq-row">
<div class="row ywdt-kj kjywblzq-row" v-if="false">
<div
class="col-6"
v-for="(tmp, i) in kjywblzq"
:key="i"
@click="kjywblzqHandelClick(i)"
class="col-6"
v-for="(tmp, i) in kjywblzq"
:key="i"
@click="kjywblzqHandelClick(i)"
>
<div class="ywdt-tp">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="ywdt-bt">{{ tmp.name }}</div>
</div>
</div>
<div class="row ywdt-kj kjywblzq-row">
<div
class="kjywblzq-col"
>
<div class="ywdt-bt">跨境业务办理（GLN/LEI/其他）</div>
</div>
</div>
</div>
</div>
</div>
......@@ -218,14 +225,14 @@
<div class="row">
<template v-for="(tmp, i) in dzfw">
<div
class="col-6 col-lg-4 dzfw-li"
:key="i"
v-if="tmp.isChecked"
@click="dzfwHandelClick(i)"
class="col-6 col-lg-4 dzfw-li"
:key="i"
v-if="tmp.isChecked"
@click="dzfwHandelClick(i)"
>
<div class="dzfw-border">
<div class="dzfw-tp">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="dzfw-bt">{{ tmp.name }}</div>
</div>
......@@ -241,28 +248,28 @@
<ul class="nav nav-tabs tabs2 row" id="myTab" role="tablist">
<li class="nav-item col-lg-2" role="presentation">
<button
class="nav-link active"
id="home-tab"
data-bs-toggle="tab"
data-bs-target="#csxx"
type="button"
role="tab"
aria-controls="home"
aria-selected="true"
class="nav-link active"
id="home-tab"
data-bs-toggle="tab"
data-bs-target="#csxx"
type="button"
role="tab"
aria-controls="home"
aria-selected="true"
>
<span>厂商信息</span>
</button>
</li>
<li class="nav-item col-lg-2" role="presentation">
<button
class="nav-link"
id="profile-tab"
data-bs-toggle="tab"
data-bs-target="#cpxx"
type="button"
role="tab"
aria-controls="profile"
aria-selected="false"
class="nav-link"
id="profile-tab"
data-bs-toggle="tab"
data-bs-target="#cpxx"
type="button"
role="tab"
aria-controls="profile"
aria-selected="false"
>
<span>产品信息</span>
</button>
......@@ -270,34 +277,34 @@
</ul>
<div class="tab-content" id="myTabContent">
<div
class="tab-pane fade show active"
id="csxx"
role="tabpanel"
aria-labelledby="home-tab"
class="tab-pane fade show active"
id="csxx"
role="tabpanel"
aria-labelledby="home-tab"
>
<div class="chaxun">
<div class="chaxun-kj">
<div class="row">
<div class="col-lg-2 chaxun-left">
<el-select
v-model="chaxun.type"
placeholder="请选择"
clearable
v-model="chaxun.type"
placeholder="请选择"
clearable
>
<el-option
v-for="(item, i) in chaxun.options"
:key="i"
:label="item.label"
:value="item.value"
v-for="(item, i) in chaxun.options"
:key="i"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="col-lg-7 chaxun-middle">
<el-input
placeholder="请输入厂商名称"
v-model="chaxun.keywords"
clearable
placeholder="请输入厂商名称"
v-model="chaxun.keywords"
clearable
>
</el-input>
</div>
......@@ -309,10 +316,10 @@
</div>
</div>
<div
class="tab-pane fade"
id="cpxx"
role="tabpanel"
aria-labelledby="profile-tab"
class="tab-pane fade"
id="cpxx"
role="tabpanel"
aria-labelledby="profile-tab"
>
<div class="chaxun">
<div class="chaxun-kj">
......@@ -320,19 +327,19 @@
<div class="col-lg-2 chaxun-left">
<el-select v-model="chaxun.type" placeholder="请选择">
<el-option
v-for="(item, i) in chaxun.options"
:key="i"
:label="item.label"
:value="item.value"
v-for="(item, i) in chaxun.options"
:key="i"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="col-lg-7 chaxun-middle">
<el-input
placeholder="请输入厂商名称"
v-model="chaxun.keywords"
clearable
placeholder="请输入厂商名称"
v-model="chaxun.keywords"
clearable
>
</el-input>
</div>
......@@ -353,9 +360,9 @@
<div class="spqqsfz-cate">
<div class="spqqsfz-cate-left">商品全球身份证</div>
<div
class="spqqsfz-cate-right"
@click="spqqsfzHandelClick"
v-if="false"
class="spqqsfz-cate-right"
@click="spqqsfzHandelClick"
v-if="false"
>
更多>
</div>
......@@ -363,7 +370,7 @@
<div class="spqqsfz-cont row">
<div class="spqqsfz-cont-left col-lg-2">
<div class="spqqsfz-cont-left-tp">
<img :src="spqqsfz.surl" alt=""/>
<img :src="spqqsfz.surl" alt="" />
</div>
</div>
<div class="spqqsfz-cont-right col-lg-10">
......@@ -387,7 +394,7 @@
<div class="col offset-2 offset-lg-3">
<button class="spqqsfz-btn blue" @click="spqqsfzHandelClick">
<span>更多商品信息</span
><img src="../../assets/image/home/more-arrow.png" alt=""/>
><img src="../../assets/image/home/more-arrow.png" alt="" />
</button>
</div>
</div>
......@@ -405,52 +412,57 @@
<div class="djwh">
<div class="home-bottom-cate">党建文化</div>
<div class="djwh-tp">
<img
<a href="/djwh" target="blank"
><img
src="../../assets/image/home/dangjianwenhua.png"
alt=""
/>
/></a>
</div>
<list2 :list="djwh.data"/>
<list2 :list="djwh.data" />
</div>
<div class="ztjj">
<div class="home-bottom-cate">专题聚焦</div>
<div class="djwh-tp">
<img src="../../assets/image/home/zhuantijujiao.png" alt=""/>
<a href="/News/DepthTopics" target="blank"
><img
src="../../assets/image/home/zhuantijujiao.png"
alt=""
/></a>
</div>
<list2 :list="ztjj.data"/>
<list2 :list="ztjj.data" />
</div>
<div class="yyly">
<div class="home-bottom-cate">应用领域</div>
<yylyList :list="yyly.data"/>
<yylyList :list="yyly.data" />
</div>
<div class="other">
<div class="home-bottom-cate">
质检中心/协会/杂志社/标准委/其他
</div>
<otherList :list="other.data"/>
<otherList :list="other.data" />
</div>
</div>
</div>
</div>
<div class="smallPCImages pc">
<VueSlickCarousel
v-bind="smallPCImagesSettings"
v-if="smallPCImages.length > 0"
ref="smallPCImages"
v-bind="smallPCImagesSettings"
v-if="smallPCImages.length > 0"
ref="smallPCImages"
>
<div
class="smallPCImages-item"
v-for="(tmpA, i) in smallPCImages"
:key="i"
class="smallPCImages-item"
v-for="(tmpA, i) in smallPCImages"
:key="i"
>
<div class="row">
<div
class="col-lg-4"
v-for="(tmpB, ii) in tmpA"
:key="ii"
@click="handelSmallImagesClick(tmpB)"
class="col-lg-4"
v-for="(tmpB, ii) in tmpA"
:key="ii"
@click="handelSmallImagesClick(tmpB)"
>
<img :src="tmpB.picIndexPath"/>
<img :src="tmpB.picIndexPath" />
</div>
</div>
</div>
......@@ -461,63 +473,21 @@
<div class="custom-arrow"></div>
</template>
</VueSlickCarousel>
<div
id="advert"
class="carousel slide"
data-bs-ride="carousel"
data-bs-interval="false"
v-if="false"
>
<div class="carousel-inner">
<div
:class="['carousel-item', { active: i === 0 }]"
v-for="(tmpA, i) in smallPCImages"
:key="i"
>
<div class="row">
<div
class="col-lg-4"
v-for="(tmpB, ii) in tmpA"
:key="ii"
@click="handelSmallImagesClick(tmpB)"
>
<img :src="tmpB.picIndexPath"/>
</div>
</div>
</div>
</div>
<button
class="carousel-control-prev"
type="button"
data-bs-target="#advert"
data-bs-slide="prev"
>
<img src="../../assets/image/home/advert-zuo.png" alt=""/>
</button>
<button
class="carousel-control-next"
type="button"
data-bs-target="#advert"
data-bs-slide="next"
>
<img src="../../assets/image/home/advert-you.png" alt=""/>
</button>
</div>
</div>
<div class="smallPCImages H5">
<VueSlickCarousel
v-bind="smallH5ImagesSettings"
v-if="smallPCImages.length > 0"
ref="smallPCImages"
v-bind="smallH5ImagesSettings"
v-if="smallPCImages.length > 0"
ref="smallPCImages"
>
<div
class="smallPCImages-item"
v-for="(tmpA, i) in smallH5Images"
:key="i"
class="smallPCImages-item"
v-for="(tmpA, i) in smallH5Images"
:key="i"
>
<div class="row">
<div class="col">
<img :src="tmpA.picIndexPath"/>
<div class="col" @click="handelSmallImagesClick(tmpA)">
<img :src="tmpA.picIndexPath" />
</div>
</div>
</div>
......@@ -534,11 +504,11 @@
</div>
</div>
</div>
<notice/>
<notice />
<modal
:dialogData="dzfwMoreDialog"
@toFatherClose="dzfwMoreHandel(false)"
v-if="dzfwMoreDialog.isShow"
:dialogData="dzfwMoreDialog"
@toFatherClose="dzfwMoreHandel(false)"
v-if="dzfwMoreDialog.isShow"
>
<template v-slot:body>
<div class="dzfwDialog">
......@@ -547,12 +517,12 @@
<li :key="i" v-if="tmp.name !== '更多定制'">
<div class="li-kj">
<el-checkbox
:value="tmp.isChecked"
class="dzfwDialog-checkbox"
@change="dzfwHandelChange(i)"
:value="tmp.isChecked"
class="dzfwDialog-checkbox"
@change="dzfwHandelChange(i)"
></el-checkbox>
<div class="dzfwDialog-ico">
<img :src="tmp.ico" alt=""/>
<img :src="tmp.ico" alt="" />
</div>
<div class="dzfwDialog-title">{{ tmp.name }}</div>
</div>
......@@ -746,6 +716,7 @@ export default {
{
ico: require("../../assets/image/home/kjywblzq-ico1.png"),
name: "LEI业务办理",
url: '/Business/GLN',
},
{
ico: require("../../assets/image/home/kjywblzq-ico2.png"),
......@@ -755,20 +726,20 @@ export default {
],
dzfw: [
{
id: '0',
id: "0",
ico: require("../../assets/image/home/dzfw-ico1.png"),
name: "商品信息服务平台",
isChecked: true,
url: "/Service/GDS",
},
{
id: '1',
id: "1",
ico: require("../../assets/image/home/dzfw-ico13.png"),
name: "教育培训平台",
isChecked: true,
},
{
id: '2',
id: "2",
ico: require("../../assets/image/home/dzfw-ico2.png"),
name: "进口商品数据通报",
isChecked: true,
......@@ -776,7 +747,7 @@ export default {
type: "link",
},
{
id: '3',
id: "3",
ico: require("../../assets/image/home/dzfw-ico3.png"),
name: "条码微站",
isChecked: true,
......@@ -784,14 +755,14 @@ export default {
type: "link",
},
{
id: '4',
id: "4",
ico: require("../../assets/image/home/dzfw-ico12.png"),
name: "追溯平台",
isChecked: true,
url: "/Service/Chinatrace",
},
{
id: '5',
id: "5",
ico: require("../../assets/image/home/dzfw-ico7.png"),
name: "条码商桥",
isChecked: true,
......@@ -799,7 +770,7 @@ export default {
type: "link",
},
{
id: '6',
id: "6",
ico: require("../../assets/image/home/dzfw-ico4.png"),
name: "商品二维码",
isChecked: true,
......@@ -807,7 +778,7 @@ export default {
type: "link",
},
{
id: '7',
id: "7",
ico: require("../../assets/image/home/dzfw-ico5.png"),
name: "GDSN",
isChecked: true,
......@@ -815,34 +786,34 @@ export default {
type: "link",
},
{
id: '8',
id: "8",
ico: require("../../assets/image/home/dzfw-ico11.png"),
name: "条码/射频(RFID)/软件检测服务",
isChecked: true,
url: "/Service/jcyxz/Barcode",
},
{
id: '9',
id: "9",
ico: require("../../assets/image/home/dzfw-ico9.png"),
name: "ECODE",
isChecked: true,
},
{
id: '10',
id: "10",
ico: require("../../assets/image/home/dzfw-ico6.png"),
name: "条码信息查询",
isChecked: true,
},
{
id: '11',
id: "11",
ico: require("../../assets/image/home/dzfw-ico8.png"),
name: "产品服务",
isChecked: false,
url: "/Service/BarcodeV",
},
{
id: '12',
id: "12",
ico: require("../../assets/image/home/dzfw-ico10.png"),
name: "平台服务",
isChecked: false,
......@@ -992,53 +963,55 @@ export default {
this.init();
},
mounted() {
this.getCustomService()
this.getCustomService();
// 从后端获取最新的定制服务
this.getCustomServiceFromServer()
this.getCustomServiceFromServer();
},
methods: {
getCustomService() {
let service = localStorage.getItem('gs-custom-service') || ''
console.log('getCustomService-----------', service)
let service = localStorage.getItem("gs-custom-service") || "";
console.log("getCustomService-----------", service);
if (service) {
service = JSON.parse(service)
this.showCustomService(service)
service = JSON.parse(service);
this.showCustomService(service);
}
},
async getCustomServiceFromServer() {
const searchGlnRes = await this.$api.home.customService();
const {returnCode, data} = searchGlnRes;
const { returnCode, data } = searchGlnRes;
if (returnCode === "0") {
localStorage.setItem('gs-custom-service', JSON.stringify(data))
this.showCustomService(data)
localStorage.setItem("gs-custom-service", JSON.stringify(data));
this.showCustomService(data);
}
},
showCustomService(list) {
this.dzfw.forEach(item => {
item.isChecked = item.name === "更多定制"
list.forEach(_item => {
this.dzfw.forEach((item) => {
item.isChecked = item.name === "更多定制";
list.forEach((_item) => {
if (_item == item.id) {
item.isChecked = true
item.isChecked = true;
}
})
})
});
});
},
setCustomService() {
const service = []
this.dzfw.forEach(item => {
const service = [];
this.dzfw.forEach((item) => {
if (item.isChecked && item.name !== "更多定制") {
service.push(parseInt(item.id, 10))
service.push(parseInt(item.id, 10));
}
})
localStorage.setItem('gs-custom-service', JSON.stringify(service))
this.updateCustomService(service)
});
localStorage.setItem("gs-custom-service", JSON.stringify(service));
this.updateCustomService(service);
},
async updateCustomService(service) {
const searchGlnRes = await this.$api.home.updateCustomService({service});
const searchGlnRes = await this.$api.home.updateCustomService({
service,
});
},
// 初始化
init() {
......@@ -1059,7 +1032,7 @@ export default {
async homeBigImages() {
// console.log(this.$api, 'this.$api');
const homeBigImagesRes = await this.$api.home.homeBigImages();
const {returnCode, data} = homeBigImagesRes;
const { returnCode, data } = homeBigImagesRes;
if (returnCode === "0") {
this.banner = data;
console.log(this.banner, "this.banner");
......@@ -1073,8 +1046,8 @@ export default {
// 要闻左侧图片资讯
async homePictureImageList() {
const homePictureImageListRes =
await this.$api.home.homePictureImageList();
const {returnCode, data} = homePictureImageListRes;
await this.$api.home.homePictureImageList();
const { returnCode, data } = homePictureImageListRes;
if (returnCode === "0") {
data.forEach((el) => {
el.picFile = `http://www.gs1cn.org/news/newsimg/${el.picFile}`;
......@@ -1086,8 +1059,8 @@ export default {
// 要闻右侧标题列表
async homeImportantNewList() {
const homeImportantNewListRes =
await this.$api.home.homeImportantNewList();
const {returnCode, data} = homeImportantNewListRes;
await this.$api.home.homeImportantNewList();
const { returnCode, data } = homeImportantNewListRes;
if (returnCode === "0") {
data.forEach((el) => {
el.time = this.$moment(el.showtime).format("MM-DD");
......@@ -1106,12 +1079,12 @@ export default {
async homeNewGtin() {
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;
});
.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;
});
},
// 党建文化新闻列表
async homeGet4PartyTopNews() {
......@@ -1120,9 +1093,9 @@ export default {
classid: 428,
};
const homeGet4PartyTopNewsRes = await this.$api.home.homeGet4PartyTopNews(
params
params
);
const {returnCode, data} = homeGet4PartyTopNewsRes;
const { returnCode, data } = homeGet4PartyTopNewsRes;
if (returnCode === "0") {
console.log(homeGet4PartyTopNewsRes, "党建文化新闻列表");
this.djwh.data = data;
......@@ -1131,7 +1104,7 @@ export default {
// 首页小轮播图
async homeSmallImages() {
const homeSmallImagesRes = await this.$api.home.homeSmallImages();
const {returnCode, data} = homeSmallImagesRes;
const { returnCode, data } = homeSmallImagesRes;
if (returnCode === "0") {
let list = [];
data.forEach((el, i) => {
......@@ -1206,7 +1179,7 @@ export default {
this.messageDialog.isShow = false;
}, 2000);
} else {
this.setCustomService()
this.setCustomService();
}
console.log(this.dzfw[i], "newValue");
},
......@@ -1425,7 +1398,8 @@ export default {
&::before {
width: 24px;
height: 50px;
background: url("../../assets/image/home/prevArrow-hover2.png") no-repeat;
background: url("../../assets/image/home/prevArrow-hover2.png")
no-repeat;
background-size: 100% 100%;
}
}
......@@ -1435,7 +1409,8 @@ export default {
&::before {
width: 24px;
height: 50px;
background: url("../../assets/image/home/nextArrow-hover2.png") no-repeat;
background: url("../../assets/image/home/nextArrow-hover2.png")
no-repeat;
background-size: 100% 100%;
}
}
......@@ -1683,7 +1658,7 @@ export default {
height: 100%;
z-index: 8;
@media screen and (max-width: 992px) {
z-index: -1
z-index: -1;
}
img {
......@@ -1961,7 +1936,11 @@ export default {
align-items: center;
justify-content: center;
}
.kjywblzq-col{
display: flex;
align-items: center;
justify-content: center;
}
.ywdt-bt {
color: #0e2c6b;
font-size: 14px;
......@@ -2040,7 +2019,8 @@ export default {
// padding: 0 10px;
cursor: pointer;
@media screen and (min-width: 992px) {
background: url("../../assets/image/home/line.png") no-repeat right center;
background: url("../../assets/image/home/line.png") no-repeat right
center;
&:nth-child(-n + 3) {
.dzfw-border {
border: 0;
......
src/views/Home/sousuo.vue
......@@ -3,7 +3,11 @@
<div class="sousuo-top">
<div class="container">
<div class="sousuo-top-form">
<el-input placeholder="请输入内容" clearable></el-input>
<el-input
placeholder="请输入内容"
clearable
v-model="search.keywords"
></el-input>
<div class="top-form-btn">
<img src="../../assets/image/home/sousuo-ico1.png" alt="" />
</div>
......@@ -43,7 +47,7 @@
aria-controls="profile"
aria-selected="false"
>
<span>新闻资讯</span>
<span>资讯动态</span>
</button>
</li>
</ul>
......@@ -69,7 +73,11 @@
aria-labelledby="home-tab"
>
<sousuoList />
<pages />
<pages
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
/>
</div>
<div
class="tab-pane fade"
......@@ -95,6 +103,14 @@ export default {
},
data() {
return {
search: {
keywords: "",
},
pageParams: {
currPage: 1,
pageSize: 10,
total: 0,
},
pickerOptions: {
shortcuts: [
{
......@@ -133,12 +149,16 @@ export default {
<style lang="scss">
.sousuo {
.sousuo-top-form {
@include elInput(50px, #414345, #414345, #fff, #cfdcea);
@include elInput(50px, #333, #666, #fff, #cfdcea);
.el-input__inner {
border-right: 0;
border-radius: 4px 0 0 4px;
}
}
.sousuo-bottom {
@include elDateTimeRange;
@include elDate(32px, #333, #666);
}
@media screen and(min-width: 992px) {
.sousuo-top-form {
.el-input {
......
src/views/Search/internal.vue
......@@ -77,9 +77,9 @@
</el-form-item>
<el-form-item label="验证码：">
<el-button type="primary" class="w240">
<el-button type="primary" class="w240" @click="handleVerification">
<div style="diplay: flex; align-item: center">
<img style="height: 14px" src="./img/guard.png" alt=""/>
<img style="height: 14px" src="./img/guard.png" alt="" />
点击此处进行验证
</div>
</el-button>
......
src/views/Service/Partners/caseList.vue
<template>
<div class="search-content n-service partners-case-list">
<div class="title">GS1标准服务提供商案例</div>
<div class="body" style="padding-top: 9px;position: relative;">
<div class="search row" style="margin: 15px 0;">
<div class="body" style="padding-top: 9px; position: relative">
<div class="search row" style="margin: 15px 0">
<div class="col-lg-4">
<el-select style="width: 100%" size="small" v-model="search.service" placeholder="请选择">
<el-select
style="width: 100%"
size="small"
v-model="search.service"
placeholder="请选择"
>
<el-option
v-for="item in serviceList"
:key="item.value"
:label="item.value"
:value="item.value">
v-for="item in serviceList"
:key="item.value"
:label="item.value"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="col-lg-4 text-left">
<el-button type="primary" size="small">搜索</el-button>
<el-button type="primary" size="small" @click="casesFrontList"
>搜索</el-button
>
</div>
<ul class="main-list">
<!-- 注意！这里请后台开发的同学替换成循环输出 top 20 -->
<li><a target="_blank" href="/Service/Partners/Case?id=5">
宁波天益医疗GS1-UDI项目案例介绍-上海路歌信息技术有限公司</a></li>
<li><a target="_blank" href="/Service/Partners/Case?id=4">
北京爱康医疗GS1-UDI项目案例介绍-上海敖维计算机科技发展有限公司</a></li>
<li><a target="_blank" href="/Service/Partners/Case?id=3">
利用GS1编码规则实施UDI满足中国法规要求，实现内部追溯</a></li>
<li><a target="_blank" href="/Service/Partners/Case?id=2">
多米诺集团在医疗领域的GS1标准应用案例</a></li>
<li><a target="_blank" href="/Service/Partners/Case?id=1">
北京爱创科技股份有限公司进口药品GS1应用案例</a></li>
<li v-for="(tmp, i) in list" :key="i" @click="handelJumpMsg(tmp)">
<a> {{ tmp.title }}</a>
</li>
</ul>
<pages
:currPage="pageParams.currPage"
......@@ -49,6 +45,7 @@
</template>
<script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -64,14 +61,38 @@ export default {
},
search: {
service: "全部服务行业",
},
serviceList: [{value: '全部服务行业'}, {value: '医疗'}, {value: '零售'}, {value: '电子商务'}, {value: '食品烟酒'}, {value: '物流'}, {value: '服装'}, {value: '快速消费品'}, {value: '消费电子产品'}, {value: '制造和零部件'}, {value: '建材'}, {value: '其他'},]
}
},
serviceList: [
{ value: "全部服务行业" },
{ value: "医疗" },
{ value: "零售" },
{ value: "电子商务" },
{ value: "食品烟酒" },
{ value: "物流" },
{ value: "服装" },
{ value: "快速消费品" },
{ value: "消费电子产品" },
{ value: "制造和零部件" },
{ value: "建材" },
{ value: "其他" },
],
list: [],
};
},
created() {
this.casesFrontList();
},
methods: {
...mapMutations("service", {
setPartnersMsg: "setPartnersMsg",
}),
// 点击列表跳转详情
handelJumpMsg(msg) {
this.setPartnersMsg(msg);
this.$router.push({
path: "/Service/Partners/content",
});
},
// 接收分页子组件传过来的值
receivePagesChild(val) {
this.pageParams.currPage = val;
......@@ -91,6 +112,8 @@ export default {
console.log(serviceCasesFrontListRes, "serviceCasesFrontListRes");
if (success) {
console.log(data, "案例介绍");
this.pageParams.total = data.totalCount;
this.list = data.list;
}
},
},
......@@ -116,7 +139,7 @@ export default {
display: inline-block;
font-size: 16px;
font-weight: 500;
color: #F26335;
color: #f26335;
margin: 10px 0;
}
......@@ -126,7 +149,7 @@ export default {
}
}
.main-list{
.main-list {
padding-left: 40px;
}
......@@ -154,6 +177,5 @@ export default {
.main-list li:hover {
background-color: #eee;
}
}
</style>
src/views/Service/Partners/content.vue
<template>
<div class="search-content n-service partners-case">
<div class="body" style="padding-top: 9px;position: relative;">
<div class="msg-cont">
<div class="container">
<div class="msg-title">
{{ partnersMsg.title }}
</div>
<div class="msg-head">
<div class="msg-head-left">
<span>作者：{{ partnersMsg.auditor }}</span>
<span>日期：{{ partnersMsg.updatedate }}</span>
<span>编辑：{{ partnersMsg.editor }}</span>
</div>
</div>
<div class="msg-text" v-html="partnersMsg.brief"></div>
</div>
</div>
</template>
<script>
import { mapState } from 'vuex';
import { mapState } from "vuex";
export default {
computed: {
...mapState('service', {
partnersMsg: 'partnersMsg',
...mapState("service", {
partnersMsg: "partnersMsg",
}),
},
created() {
console.log('TODO QUERY',this.$route.query, this.partnersMsg);
console.log("TODO QUERY", this.$route.query, this.partnersMsg);
},
mounted() {
// 面包屑单独处理
this.$store.commit("system/SET_BREADCRUMB", [
{name: "服务中心", path: "/Service/BarcodeV"},
{name: "标准服务提供商", path: "/Service/Partners/index"},
{name: "服务提供商介绍"},
{ name: "服务中心", path: "/Service/BarcodeV" },
{ name: "标准服务提供商", path: "/Service/Partners/index" },
{ name: "服务提供商介绍" },
]);
},
methods: {},
......@@ -30,14 +41,49 @@ export default {
</script>
<style lang="scss">
.n-service.partners-case {
p {
// font-family: PingFangSC-Regular, PingFang SC;
margin: 10px 0;
font-size: 14px;
font-weight: 400;
color: #414345;
text-indent: 2em;
.msg-cont {
@include module-box;
padding: 30px 0;
.msg-title {
color: #454545;
font-size: 26px;
text-align: center;
}
.msg-head {
border-bottom: 1px dashed #c5d8ee;
padding: 20px 0;
display: flex;
justify-content: space-between;
font-size: 12px;
flex-wrap: wrap;
.msg-head-left {
span {
margin-right: 25px;
&:last-child {
margin: 0;
}
}
}
.msg-head-right {
display: flex;
align-items: center;
img {
margin-left: 14px;
}
}
}
.msg-text {
margin-top: 20px;
p {
text-indent: 25px;
font-size: 14px;
font-weight: 400;
color: #414345;
}
.strong {
font-size: 14px;
font-weight: bold;
}
}
}
</style>
src/views/Service/Partners/list.vue
......@@ -42,52 +42,14 @@
</div>
<div class="col-lg-4 text-left">
<el-button type="primary" size="small" @click="partnersFrontList">搜索</el-button>
<el-button type="primary" size="small" @click="partnersFrontList"
>搜索</el-button
>
</div>
<ul class="main-list">
<!-- 注意！这里请后台开发的同学替换成循环输出 top 20 -->
<li>
<a target="_blank" href="/Service/Partners/content?id=7">
上海路歌信息技术有限公司</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=6">
上海悦孜企业信息咨询有限公司</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=5">
上海敖维计算机科技发展有限公司</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=4">
北京东方捷码科技开发中心</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=3">
北京爱创科技股份有限公司</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=2">
多米诺标识科技有限公司</a
>
</li>
<li>
<a target="_blank" href="/Service/Partners/content?id=1">
北京嘉华汇诚科技股份有限公司</a
>
<li v-for="(tmp, i) in list" :key="i" @click="handelJumpMsg(tmp)">
<a> {{ tmp.title }}</a>
</li>
</ul>
<pages
......@@ -102,6 +64,7 @@
</template>
<script>
import { mapMutations } from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -118,7 +81,7 @@ export default {
search: {
technology: "全部技术领域",
service: "全部服务行业",
},
},
technologyList: [
{ value: "全部技术领域" },
{ value: "标识的打印和制作" },
......@@ -141,12 +104,23 @@ export default {
{ value: "建材" },
{ value: "其他" },
],
list: [],
};
},
created() {
this.partnersFrontList();
},
methods: {
...mapMutations("service", {
setPartnersMsg: "setPartnersMsg",
}),
// 点击列表跳转详情
handelJumpMsg(msg) {
this.setPartnersMsg(msg);
this.$router.push({
path: "/Service/Partners/content",
});
},
// 接收分页子组件传过来的值
receivePagesChild(val) {
this.pageParams.currPage = val;
......@@ -166,6 +140,8 @@ export default {
console.log(businessGetPlanBranchListRes, "businessGetPlanBranchListRes");
if (success) {
console.log(data, "服务商列表");
this.pageParams.total = data.totalCount;
this.list = data.list;
}
},
},
......
src/vuex/service/types.js
export const SET_PARTNERS_MSG = "SetPartnersMsg";
export const SET_PARTNERS_MSG = "setPartnersMsg";
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