Skip to content

G
gs1
Commit 372f3003 by 林家欣
Options

修改导航被放出条码查询图形验证但未逻辑联调

parent a83e4985
Showing with 113 additions and 117 deletions
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/index.vue
......@@ -17,7 +17,7 @@
@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>
......@@ -58,7 +58,7 @@
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
......@@ -115,7 +115,7 @@
role="tabpanel"
aria-labelledby="yaowen-tab"
>
<list :list="news[0].data"/>
<list :list="news[0].data" />
</div>
</div>
</div>
......@@ -145,7 +145,7 @@
@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>
......@@ -164,7 +164,7 @@
@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>
......@@ -184,7 +184,7 @@
@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,7 +194,7 @@
<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"
......@@ -202,11 +202,18 @@
@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>
......@@ -225,7 +232,7 @@
>
<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>
......@@ -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,29 +412,34 @@
<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>
......@@ -450,7 +462,7 @@
:key="ii"
@click="handelSmallImagesClick(tmpB)"
>
<img :src="tmpB.picIndexPath"/>
<img :src="tmpB.picIndexPath" />
</div>
</div>
</div>
......@@ -461,48 +473,6 @@
<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
......@@ -516,8 +486,8 @@
: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,7 +504,7 @@
</div>
</div>
</div>
<notice/>
<notice />
<modal
:dialogData="dzfwMoreDialog"
@toFatherClose="dzfwMoreHandel(false)"
......@@ -552,7 +522,7 @@
@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");
......@@ -1074,7 +1047,7 @@ export default {
async homePictureImageList() {
const homePictureImageListRes =
await this.$api.home.homePictureImageList();
const {returnCode, data} = homePictureImageListRes;
const { returnCode, data } = homePictureImageListRes;
if (returnCode === "0") {
data.forEach((el) => {
el.picFile = `http://www.gs1cn.org/news/newsimg/${el.picFile}`;
......@@ -1087,7 +1060,7 @@ export default {
async homeImportantNewList() {
const homeImportantNewListRes =
await this.$api.home.homeImportantNewList();
const {returnCode, data} = homeImportantNewListRes;
const { returnCode, data } = homeImportantNewListRes;
if (returnCode === "0") {
data.forEach((el) => {
el.time = this.$moment(el.showtime).format("MM-DD");
......@@ -1122,7 +1095,7 @@ export default {
const homeGet4PartyTopNewsRes = await this.$api.home.homeGet4PartyTopNews(
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/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>
......
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