Skip to content

G
gs1
Commit 82f21659 by Jianli Ou
Options

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

 Conflicts:
	src/views/Search/external.vue
parents 649824f2 a055536c
Showing with 449 additions and 331 deletions
babel.config.js
module.exports = {
presets: [
["@vue/app", {
"useBuiltIns": "entry",
"polyfills": [
"es6.promise",
"es6.symbol"
],
"useBuiltIns": "entry"
]
}]
],
plugins: [
......
package.json
......@@ -13,7 +13,6 @@
"fix-memory-limit": "cross-env LIMIT=3072 increase-memory-limit"
},
"dependencies": {
"@babel/polyfill": "^7.12.1",
"@popperjs/core": "^2.10.1",
"@tweenjs/tween.js": "^18.5.0",
"bootstrap": "^5.1.0",
......@@ -41,6 +40,7 @@
"xss": "^1.0.6"
},
"devDependencies": {
"@babel/polyfill": "^7.12.1",
"@vue/cli-plugin-babel": "^3.12.1",
"@vue/cli-plugin-eslint": "^3.12.1",
"@vue/cli-service": "^3.12.1",
......
src/assets/css/english.scss
......@@ -160,6 +160,7 @@ summary {
margin-left: auto;
padding-left: 15px;
padding-right: 15px;
max-width: 100%;
}
.toolkit .content-module-container {
......@@ -297,7 +298,7 @@ h4,
padding: 0;
margin-bottom: 0;
list-style: none;
background-color: #fff;
// background-color: #fff;
border-radius: 0;
}
......@@ -488,7 +489,7 @@ small,
}
}
}
......@@ -564,8 +565,13 @@ small,
width: 970px;
}
.toolkit .carousel-inner .item .carousel-glyph {
display: none;
}
.banner {
height: 400px;
.slick-arrow {
&.slick-prev {
left: 38%;
......
src/assets/css/englishComm.scss
.englishToolkit {
.arousel-glyph {
.carousel-glyph {
margin-top: -40px;
}
......@@ -32,4 +32,15 @@
}
}
}
}
.leftCon {
position: relative;
.slick-dots {
background: rgba(0, 0, 0, 0.15);
height: 42px;
line-height: 42px;
bottom: -20px !important;
}
}
\ No newline at end of file
src/components/layout/englishHeader/index.vue
......@@ -4,11 +4,7 @@
<nav class="navbar-nav-wrap">
<!-- Default Logo -->
<a class="navbar-brand" href="/Home" aria-label="Front">
<img
class="navbar-brand-logo"
src="../../../assets/image/head/logo.png"
alt="Logo"
/>
<img class="navbar-brand-logo" src="../../../assets/image/head/logo.png" alt="Logo" />
</a>
<!-- End Default Logo -->
......@@ -18,36 +14,18 @@
<ul class="navbar-nav">
<!-- Nav items-->
<template v-for="nav in navList">
<li
v-if="nav.children && nav.children.length > 0"
class="gs-nav-item nav-item"
:key="nav.id"
:class="{ active: currentNav === nav.id }"
@click="handleNavClick(nav, $event)"
>
<a
:id="`gs-nav-item-${nav.id}`"
class="nav-link"
aria-current="page"
href="javascript:void(0)"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>{{ nav.name }}</a
>
<li v-if="nav.children && nav.children.length > 0" class="gs-nav-item nav-item" :key="nav.id"
:class="{ active: currentNav === nav.id }" @click="handleNavClick(nav, $event)">
<a :id="`gs-nav-item-${nav.id}`" class="nav-link" aria-current="page" href="javascript:void(0)"
role="button" data-bs-toggle="dropdown" aria-expanded="false">{{ nav.name }}</a>
<i class="mobile-menu-down bi bi-chevron-compact-down"></i>
<!-- Dropdown Menu -->
<HeaderDropdown :nav="nav" @itemClick="handleItemClick" />
<!-- End Dropdown Menu -->
</li>
<li
v-else
:key="nav.id"
@click="handleNavClick(nav, $event)"
class="gs-nav-item nav-item"
:class="{ active: currentNav === nav.id }"
>
<li v-else :key="nav.id" @click="handleNavClick(nav, $event)" class="gs-nav-item nav-item"
:class="{ active: currentNav === nav.id }">
<a class="nav-link" href="javascript:void(0)">{{
nav.name
}}</a>
......@@ -78,7 +56,7 @@ import { deepFindBreadcrumb } from "@/utils/utils";
export default {
components: { HeaderBtn, HeaderDropdown },
data() {
data () {
return {
// 点击事件来自头部导航
fromNav: false,
......@@ -89,7 +67,7 @@ export default {
preActive: "",
};
},
created() {
created () {
// 监听路由 处理nav高亮 和面包屑 和subnav
nav.forEach((nav_) => {
if (this.$route.path.startsWith(nav_.link)) {
......@@ -119,14 +97,14 @@ export default {
}
});
},
mounted() {
mounted () {
window.addEventListener("click", this.handleWindowClick);
},
beforeDestroy() {
beforeDestroy () {
window.removeEventListener("click", this.handleWindowClick);
},
methods: {
handleWindowClick() {
handleWindowClick () {
// console.log('handleWindowClick', this.fromNav, this.preActive);
if (this.preActive && !this.fromNav) {
this.currentNav = this.preActive;
......@@ -136,9 +114,10 @@ export default {
this.fromDropdown = false;
},
handleNavClick(nav) {
// debugger
if (!nav.children || nav.children.length === 0) {
handleNavClick (nav) {
if (nav.linkFlag == 1) {
window.open(nav.link);
} else if (!nav.children || nav.children.length === 0) {
this.currentNav = nav.id;
this.preActive = "";
this.$router.push({ path: nav.link });
......@@ -162,7 +141,7 @@ export default {
}
},
handleItemClick(item) {
handleItemClick (item) {
this.fromDropdown = true;
if (item.link.startsWith("http")) {
window.open(item.link);
......@@ -179,7 +158,7 @@ export default {
}
},
updateCurrent(id) {
updateCurrent (id) {
// console.log('updateCurrent', id);
this.currentNav = id;
this.preActive = "";
......
src/components/layout/topBanner.vue
......@@ -32,7 +32,9 @@
<div class="top-banner-item tb-hover" @click="handleSearch">
<img src="../../assets/image/head/search.png" alt=""/>
</div>
<span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>
<!-- <span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>-->
<img v-if="user.username" @click="toAdmin" style="width:22px;cursor: pointer;margin-left: 20px"
src="../../assets/image/mymanage/pic_touxiang.png" alt="">
</div>
</div>
</template>
......
src/main.js
import '@babel/polyfill'
import Vue from "vue";
import App from "./App.vue";
import '@babel/polyfill';
import router from "./router/index";
import store from "./vuex/store";
import $ from "jquery";
......
src/views/Business/Animalcode.vue
......@@ -18,7 +18,7 @@
</p>
<p>
<strong
><a :href="`${urls.gs1cn}Manage/animalRFID.aspx`" target="_blank"
><a :href="`${urls.gs1cnTwo}Manage/animalRFID.aspx`" target="_blank"
>» 解读国家标准《动物射频识别代码结构》</a
></strong
>
......@@ -28,7 +28,7 @@
<Title :father="animalcode.title2"></Title>
<p></p>
<div style="text-align: center; padding-bottom:10px">
<a :href="`${urls.gs1cn}Manage/animalDJ.htm`" target="_blank">
<a :href="`${urls.gs1cnTwo}Manage/animalDJ.htm`" target="_blank">
<img
src="../../assets/image/business//dengji-pic-s.jpg"
alt="国家动物代码动物管理者注册登记表"
......
src/views/Business/Guide1.vue
......@@ -18,7 +18,7 @@
<div class="msg-title" ref="1-2">条码注册方式：</div>
<p>
线上办理：登录中国物品编码中心官网，点击“我要申请商品条码”，手机号绑定成功后，按流程操作即可。<a
:href="`${urls.gs1cn}manage/down/2021zcbl.pdf`"
:href="`${urls.gs1cnTwo}manage/down/2021zcbl.pdf`"
target="_blank"
style="color: Red"
>查看操作指南</a
......
src/views/Business/Guide2.vue
......@@ -81,7 +81,7 @@
"
>
线上办理：登录中国商品信息服务平台，从“应用市场—条码商桥”处下单，即时支付即时下载。<a
:href="`${urls.gs1cn}manage/down/2021jpdz.pdf`"
:href="`${urls.gs1cnTwo}manage/down/2021jpdz.pdf`"
target="_blank"
style="color: Red"
>查看操作指南</a
......
src/views/Business/Guide3.vue
......@@ -11,8 +11,8 @@
<b>登录平台</b>
</p>
<p>
登录中国物品编码中心官网<a href="http://www.gs1cn.org" target="_blank"
>www.gs1cn.org</a
登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
>{{urls.host}}</a
>
，点击“成员专区”或点击“我要通报编码信息”。
</p>
......
src/views/Business/Guide5.vue
......@@ -7,8 +7,8 @@
<b>1、成员专区培训</b>
</p>
<p>
登录中国物品编码中心官网<a href="http://www.gs1cn.org" target="_blank"
>www.gs1cn.org</a
登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
>{{urls.host}}</a
>，点击“成员专区”，通过条码卡卡号密码登录。
</p>
<div class="text-center">
......@@ -80,8 +80,8 @@
<div class="msg-title" ref="5-2">线下培训：</div>
<p>
登录中国物品编码中心官网<a href="http://www.gs1cn.org" target="_blank"
>www.gs1cn.org</a
登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
>{{urls.origin}}</a
>，点击“我要培训”。
</p>
<div class="text-center">
......@@ -113,6 +113,7 @@
</template>
<script>
import cate from "../comps/cate.vue";
import { mapState } from "vuex";
export default {
components: {
......@@ -126,6 +127,9 @@ export default {
},
};
},
computed: {
...mapState(["urls"]),
},
watch: {
$route: {
handler(val) {
......
src/views/Business/Training.vue
......@@ -85,8 +85,8 @@
<p>尊敬的中国商品条码系统成员：</p>
<p class="xspxgg-note">
当前，新冠病毒肺炎疫情已进入关键阶段，为进一步做好疫情防控，有序推进我们的技术服务工作，中国物品编码中心全国分支机构暂停现场培训，同时为系统成员提供免费的线上培训课程和相关学习资料，请点击<a
:href="`${urls.gs1cn}news/article_admin.aspx?Id=9766`"
>{{urls.gs1cn}}news/article_admin.aspx?Id=9766</a
:href="`${urls.gs1cnTwo}news/article_admin.aspx?Id=9766`"
>{{urls.gs1cnTwo}}news/article_admin.aspx?Id=9766</a
>进行查看。
</p>
</div>
......
src/views/Business/UDI.vue
......@@ -118,7 +118,7 @@
<li>
<p>
<a
:href="`${urls.gs1cn}/Manage/down/基于商品条码（GS1）标准的医疗器械唯一标识（UDI）实施指南.pdf`"
:href="`${urls.gs1cnTwo}/Manage/down/基于商品条码（GS1）标准的医疗器械唯一标识（UDI）实施指南.pdf`"
target="_blank"
>1.基于商品条码（GS1）标准的医疗器械唯一标识（UDI）实施指南</a
>
......@@ -127,7 +127,7 @@
<li>
<p>
<a
:href="`${urls.gs1cn}/Manage/down/基于商品条码（GS1）标准的医疗器械唯一标识（UDI）系统实施常见问题.pdf`"
:href="`${urls.gs1cnTwo}/Manage/down/基于商品条码（GS1）标准的医疗器械唯一标识（UDI）系统实施常见问题.pdf`"
target="_blank"
>2.基于商品条码（GS1）标准的医疗器械唯一标识（UDI）系统实施常见问题</a
>
......
src/views/Business/copms/bgxz.vue
......@@ -42,7 +42,7 @@ export default {
const { returnCode, data } = businessDownLoadRes;
if (returnCode === "0") {
data.forEach(el => {
el.docfile = `${this.urls.gs1cn}manage/down/${el.docfile}`;
el.docfile = `${this.urls.gs1cnTwo}manage/down/${el.docfile}`;
});
this.list = data;
}
......
src/views/Djwh/index.vue
......@@ -17,7 +17,7 @@
<div class="col-lg-5 left-img" style="padding-left:23px;padding-right:15px">
<div class="border-div">
<a href="https://www.12371.cn/special/19jlzqh/">
<img :src="`${urls.gs1cn}djwh/images/19jlzqh.jpg`" alt="">
<img :src="`${urls.gs1cnTwo}djwh/images/19jlzqh.jpg`" alt="">
</a>
<a href="http://www.samr.gov.cn/zt/bwcx/">
<img src="../../assets/image/djwh/19thpic1.jpg" alt="">
......
src/views/English/Home/components/trodList.vue
......@@ -6,21 +6,55 @@
<h4></h4>
<div class="content-module-wrapper" style="border-top: 7px solid #c1d82f"></div>
<div class="row content">
<div class="col-xs-12"></div>
<div class="col-xs-12">
<p style="line-height: 28px; padding: 22px; font-size: 14px">
In order to address to the domestic demand of healthcare safety,
GS1 China strengthened and broadened the use of barcode
technology in the healthcare sector in 2007, and established
Healthcare Workgroup in 2008 consists of staff from 20 branches
all around China. There are several projects including
“Implantable medical device traceability in hospital”, “Beijing
cosmetics market supervision system” and “Product ID for Chinese
traditional medicine” had been carried out by the branches
organized.
</p>
</div>
<div class="carousel-inner leftCon" role="listbox" style="height: 525px">
<VueSlickCarousel v-bind="bannerSettings">
<div class="item active" role="option" aria-selected="true" tabindex="0" style="padding: 0px">
<blockquote class="typography-blockquote"
style="position: relative; border-left: 0;
margin: 0px 0; padding-top: 0px; padding-bottom: 0px; padding-right: 0px; font-size: 24px;
color: #002c6c; margin: 0 auto; width: 100%; padding: 0px; border-bottom: none">
<div class="row content">
<div class="col-xs-12">
<img src="@/assets/image/english/1.jpg" class="img-responsive"></div>
<div class="col-xs-12">
<p style="line-height: 28px; padding: 22px; font-size: 14px">
In order to address to the domestic demand of healthcare safety, GS1 China strengthened
and broadened the use of barcode technology in the healthcare sector in 2007, and
established Healthcare Workgroup in 2008 consists of staff from 20 branches all
around China. There are several projects including “Implantable medical device traceability
in hospital”, “Beijing cosmetics market supervision system” and “Product ID for
Chinese traditional medicine” had been carried out by the branches organized.
</p>
</div>
</div>
</blockquote>
</div>
<div class="item" role="option" aria-selected="false" tabindex="-1" style="padding: 0px">
<blockquote class="typography-blockquote"
style="position: relative; border-left: 0;
margin: 0px 0; padding-top: 0px; padding-bottom: 0px; padding-right: 0px; font-size: 24px;
color: #002c6c; margin: 0 auto; width: 100%; padding: 0px; border-bottom: none">
<div class="row content">
<div class="col-xs-12" style="float: none">
<img src="@/assets/image/english/2.jpg" class="img-responsive">
<div class="col-xs-12">
</div>
<p style="line-height: 28px; padding: 22px; font-size: 14px">
Barcode applications have been extended to the food safety area with great efforts
and a number of food safety tracking and tracing system demonstrations have been
established on a range of products such as Shandong seafood, Xinjiang cantaloupe,
Yunnan pork, Sichuan tea, and the Hetian chicken of Fujian, this consolidates the
critical role the barcode plays in our national food safety tracking and tracing
system
</p>
</div>
</div>
</blockquote>
</div>
<template #customPaging>
<div class="custom-dot"></div>
</template>
</VueSlickCarousel>
</div>
</div>
</div>
......@@ -73,10 +107,19 @@ import VueSlickCarousel from "vue-slick-carousel";
import "vue-slick-carousel/dist/vue-slick-carousel.css";
import "vue-slick-carousel/dist/vue-slick-carousel-theme.css";
export default {
components: { VueSlickCarousel},
components: { VueSlickCarousel },
data () {
return {
bannerSettings: {
arrows: true,
autoplay: false,
autoplaySpeed: 4000,
dots: true,
centerMode: true,
centerPadding: "0% 0% 0%",
slidesToShow: 1,
slidesToScroll: 1,
},
}
},
methods: {
......
src/views/English/Home/index.vue
......@@ -19,7 +19,7 @@
</p>
<a @click="handleGo('SecondaryMenu/Introduction')">
<button type="button" class="btn-primary btn-margin bg-blue">
More About GS1 China0000
More About GS1 China
</button></a>
</div>
</div>
......
src/views/English/SecondaryMenu/Barcode.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Commodity Barcode</li>
</ol>
......@@ -100,11 +100,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/ContactUs.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Contact Us</li>
</ol>
......@@ -27,11 +27,12 @@
<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 class="iw_poi_title">GS1 China</div>
<div class="iw_poi_content">
3-6 F, Wing B, Imperial International Bldg., No.138 Andingmenwai
Street, Dongcheng District, Beijing 100011, P.R.China
</div>
<div>邮编：100011</div>
<!-- <div>邮编：100011</div> -->
</bm-info-window>
</baidu-map>
</div>
......@@ -43,7 +44,7 @@
<p class="small" style="padding: 20px">
Tel: (+86) 400-7000-690<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>
Webside:<a :href="`${urls.origin}`" target="_blank">{{urls.origin}}</a>
</p>
</div>
</div>
......@@ -78,17 +79,22 @@
</div>
</template>
<script>
import { mapState } from "vuex";
export default {
data () {
return {
map: {
label: "中国物品编码中心",
center: { lng: 116.415256, lat: 39.961205 },
label: "GS1 China",
center: { lng: 116.415108, lat: 39.961695 },
zoom: 16,
show: false,
},
};
},
computed: {
...mapState(["urls"]),
},
methods: {
handleGo (val) {
this.$router.push({ path: val });
......@@ -111,4 +117,19 @@ export default {
height: 500px;
}
}
.iw_poi_title {
color: #cc5522;
font-size: 14px;
font-weight: bold;
overflow: hidden;
padding-right: 13px;
white-space: nowrap;
}
.iw_poi_content {
font: 12px arial, sans-serif;
overflow: visible;
padding-top: 4px;
white-space: -moz-pre-wrap;
word-wrap: break-word;
}
</style>
src/views/English/SecondaryMenu/ECommerce.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">ECommerce</li>
</ol>
......@@ -88,11 +88,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/EPC.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">EPC</li>
</ol>
......@@ -76,11 +76,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/GDSN.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">GDSN</li>
</ol>
......@@ -83,11 +83,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/HanXinCode.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Han Xin Code</li>
</ol>
......@@ -162,11 +162,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/InnovativeSectors.vue
<template>
<div class="container site-content flush-outside" style="width: 100%">
<div class="container site-content flush-outside" style="width: 100%;max-width: 100%;">
<div class="container" style="padding-left:15px; padding-right:15px">
<div class="row" style="background-color: #FFF;margin-right: 0px;
margin-top: 20px">
......@@ -148,11 +148,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......@@ -160,4 +160,11 @@ export default {
</script>
<style scoped lang="scss" >
@import "@/assets/css/english";
.container {
padding-left: 0px;
padding-right: 0px;
}
.toolkit .site-content {
margin-top: 0;
}
</style>
src/views/English/SecondaryMenu/Introduction.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Introduction</li>
</ol>
......@@ -69,11 +69,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/eLearning.vue
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">e-Learning</li>
</ol>
......@@ -46,49 +46,31 @@
register.
</p>
<p class="small" style="padding-top: 20px; line-height: 30px">
<a href="http://learn.gs1.org/" target="_blank"
>Demo of e-Learning</a
>
<a href="http://learn.gs1.org/" target="_blank">Demo of e-Learning</a>
</p>
<a href="http://learn.gs1.org/" target="_blank"
><img
class="img-responsive center-block"
src="@/assets/image/english/prntscreen_course.gif"
alt=""
/></a>
<a href="http://learn.gs1.org/" target="_blank"><img class="img-responsive center-block"
src="@/assets/image/english/prntscreen_course.gif" alt="" /></a>
</div>
<div class="col-sm-3" style="padding-top: 15px">
<div class="content-module-container">
<h4></h4>
<div
class="content-module-wrapper"
style="border-top: 7px solid #7ac143"
></div>
<div class="content-module-wrapper" style="border-top: 7px solid #7ac143"></div>
<div class="content-module content-module-padding">
<h4>Tools</h4>
<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>
<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>
</div>
<div class="content-module content-module-padding">
<h4>Standards</h4>
<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
work</a><br />
GS1 standards help you single out what really matters.
</p>
</div>
......@@ -101,11 +83,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/SecondaryMenu/industryPromotion.vue
......@@ -5,8 +5,8 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color:#f4f4f4">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li class="active">Industry Promotion</li>
</ol>
</ul>
......
src/views/English/TertiaryMenu/IndustryPromotion/FoodSafety.vue
......@@ -5,12 +5,10 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li>
<a @click="handleGo('/SecondaryMenu/industryPromotion')"
>Industry Promotion</a
>
<a @click="handleGo('/SecondaryMenu/industryPromotion')">Industry Promotion</a>
</li>
<li class="active">Food safety</li>
</ol>
......@@ -59,11 +57,7 @@
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<img
class="img-responsive center-block"
src="@/assets/image/english/FS-2.jpg"
alt="Food satety"
/>
<img class="img-responsive center-block" src="@/assets/image/english/FS-2.jpg" alt="Food satety" />
</div>
</div>
</section>
......@@ -72,11 +66,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/TertiaryMenu/IndustryPromotion/Healthcare.vue
......@@ -5,12 +5,10 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li>
<a @click="handleGo('/SecondaryMenu/industryPromotion')"
>Industry Promotion</a
>
<a @click="handleGo('/SecondaryMenu/industryPromotion')">Industry Promotion</a>
</li>
<li class="active">Healthcare</li>
</ol>
......@@ -38,20 +36,13 @@
stakeholders in the healthcare supply chain to gain more
efficiency and safety through adopting GS1 system. GS1 China has
also published application guide, reference book and newsletters,
all of them can be found at website:<a
href=" http://healthcare.ancc.org.cn/"
target="_blank"
>
all of them can be found at website:<a href=" http://healthcare.ancc.org.cn/" target="_blank">
http://healthcare.ancc.org.cn/
</a>
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<img
class="img-responsive center-block"
src="@/assets/image/english/HC-2.jpg"
alt="Healthcare"
/>
<img class="img-responsive center-block" src="@/assets/image/english/HC-2.jpg" alt="Healthcare" />
</div>
</div>
</section>
......@@ -60,11 +51,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/TertiaryMenu/IndustryPromotion/Others.vue
......@@ -5,12 +5,10 @@
<div class="row">
<div class="col-md-12">
<ul class="nav navbar-nav mm-float1">
<ol class="breadcrumb" style="background-color: #f4f4f4">
<ol class="breadcrumb">
<li><a @click="handleGo('/EnglishHome')">Home</a></li>
<li>
<a @click="handleGo('/SecondaryMenu/industryPromotion')"
>Industry Promotion</a
>
<a @click="handleGo('/SecondaryMenu/industryPromotion')">Industry Promotion</a>
</li>
<li class="active">Others</li>
</ol>
......@@ -69,11 +67,7 @@
</p>
</div>
<div class="col-sm-3" style="padding-top: 85px">
<img
class="img-responsive center-block"
src="@/assets/image/english/TL-2.png"
alt="Food satety"
/>
<img class="img-responsive center-block" src="@/assets/image/english/TL-2.png" alt="Food satety" />
</div>
</div>
</section>
......@@ -82,11 +76,11 @@
</template>
<script>
export default {
data() {
data () {
return {};
},
methods: {
handleGo(val) {
handleGo (val) {
this.$router.push({ path: val });
},
},
......
src/views/English/blankMain.vue
<template>
<div class="toolkit" style="background-color: #f4f4f4">
<div class="toolkit">
<TopBanner></TopBanner>
<Header></Header>
<div>
......
src/views/Home/index.vue
......@@ -1070,7 +1070,7 @@ export default {
const { returnCode, data } = homePictureImageListRes;
if (returnCode === "0") {
data.forEach((el) => {
el.picFile = `${this.urls.gs1cn}news/newsimg/${el.picFile}`;
el.picFile = `${this.urls.gs1cnTwo}news/newsimg/${el.picFile}`;
});
this.newsBanner = data;
}
......@@ -1128,7 +1128,7 @@ export default {
if (returnCode === "0") {
let list = [];
data.forEach((el, i) => {
el.picIndexPath = `${this.urls.gs1cn}img/demo/${el.picIndexPath}`;
el.picIndexPath = `${this.urls.gs1cnTwo}img/demo/${el.picIndexPath}`;
this.smallH5Images.push(el);
list.push(el);
if ((i + 1) % 3 === 0) {
......
src/views/MyManage/UnVerify/uploadcalibration.vue
......@@ -20,13 +20,8 @@
<el-button type="primary" style="width: 110px">上传</el-button>查看检测校准申请历史上传文件
<p style="margin-top:10px;">支持png，bmp，jpg格式，大小不限</p>
</span>
</div>
</div>
</div>
</div>
......
src/views/MyManage/index.vue
......@@ -215,48 +215,53 @@ export default {
};
},
created() {
// TODO 判断用户状态 处理一下左侧的 sub_nav 和用户panel
// // TODO 判断用户状态 处理一下左侧的 sub_nav 和用户panel
const user = JSON.parse(localStorage.getItem('gs-user'))
// 1. 未申请条码
// 2.系统成员
// 3.管理员
// 4.分中心管理员
if (user.type === 'admin') {
this.userType = ADMIN;
} else if (user.type === 'adminBranch') {
this.userType = ADMINBRANCH;
} else if (user.type === 'verify') {
this.userType = SYSTEM_MEMBER;
} else {
this.userType = UN_VERIFY;
if(!user){
this.$router.push({path:'/login'})
}
// // 1. 未申请条码
// // 2.系统成员
// // 3.管理员
// // 4.分中心管理员
// if (user.type === 'admin') {
// this.userType = ADMIN;
// } else if (user.type === 'adminBranch') {
// this.userType = ADMINBRANCH;
// } else if (user.type === 'verify') {
// this.userType = SYSTEM_MEMBER;
// } else {
// this.userType = UN_VERIFY;
// }
//
// if (this.userType === UN_VERIFY) {
// if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
// this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
// }
// if (this.loginInfo.userType === 3 && this.loginInfo.isQY === 1) {
// this.$store.commit("system/SET_SUB_NAV", this.isQYRouterList);
// return
// }
// this.$store.commit("system/SET_SUB_NAV", this.routerList);
// } else if (this.userType === SYSTEM_MEMBER) {
// if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
// this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
// }
// this.routerList[0].link = '/MyManage/SystemMember/index',
// this.routerList[2].children.push({
// id: uuid("gs_nav"),
// name: "企业信息",
// index: 3,
// link: '/MyManage/SystemMember/companyInfo'
// })
// this.$store.commit("system/SET_SUB_NAV", this.routerList);
// } else if (this.userType === ADMIN) {
// this.$store.commit("system/SET_SUB_NAV", this.adminRouterList);
// } else if (this.userType === ADMINBRANCH) {
// this.$store.commit("system/SET_SUB_NAV", this.adminBranchRouterList);
// }
if (this.userType === UN_VERIFY) {
if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
}
if (this.loginInfo.userType === 3 && this.loginInfo.isQY === 1) {
this.$store.commit("system/SET_SUB_NAV", this.isQYRouterList);
return
}
this.$store.commit("system/SET_SUB_NAV", this.routerList);
} else if (this.userType === SYSTEM_MEMBER) {
if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
}
this.routerList[0].link = '/MyManage/SystemMember/index',
this.routerList[2].children.push({
id: uuid("gs_nav"),
name: "企业信息",
index: 3,
link: '/MyManage/SystemMember/companyInfo'
})
this.$store.commit("system/SET_SUB_NAV", this.routerList);
} else if (this.userType === ADMIN) {
this.$store.commit("system/SET_SUB_NAV", this.adminRouterList);
} else if (this.userType === ADMINBRANCH) {
this.$store.commit("system/SET_SUB_NAV", this.adminBranchRouterList);
}
this.$store.commit("system/SET_SUB_NAV", this.routerList);
},
methods: {},
};
......
src/views/News/DepthTopics.vue
......@@ -45,7 +45,6 @@ export default {
const params = {
page: page,
limit: this.tableResult.pageSize,
classId:9
};
const listRes =
await this.$api.news.sdztList(params);
......
src/views/News/ECommerce.vue
......@@ -66,10 +66,10 @@
</p>
<div class="list-style">
<ul >
<li ><a :href="`${urls.gs1cn}Manage/down/201601Ecomm.pdf`" target="_blank">《电子商务商品条码应用指南》</a></li>
<li ><a :href="`${urls.gs1cn}Manage/down/2016Ecommerce.pdf`" target="_blank">《商品条码在电子商务领域的应用》</a></li>
<li ><a :href="`${urls.gs1cn}News/viewsub.aspx?id=38`" target="_blank">《ebXML标准技术规范——全球电子商务标准》</a></li>
<li ><a :href="`${urls.gs1cn}Manage/down/201204GLN.pdf`" target="_blank">GLN</a></li>
<li ><a :href="`${urls.gs1cnTwo}Manage/down/201601Ecomm.pdf`" target="_blank">《电子商务商品条码应用指南》</a></li>
<li ><a :href="`${urls.gs1cnTwo}Manage/down/2016Ecommerce.pdf`" target="_blank">《商品条码在电子商务领域的应用》</a></li>
<li ><a :href="`${urls.gs1cnTwo}News/viewsub.aspx?id=38`" target="_blank">《ebXML标准技术规范——全球电子商务标准》</a></li>
<li ><a :href="`${urls.gs1cnTwo}Manage/down/201204GLN.pdf`" target="_blank">GLN</a></li>
</ul>
</div>
......
src/views/News/FoodSafety.vue
......@@ -120,44 +120,44 @@ export default {
this.listFile= [
{
title: "GS1全球追溯标准（第二版）",
directpath: `${this.urls.gs1cn}Manage/down/GS1全球追溯标准（第二版）.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1全球追溯标准（第二版）.pdf`
},
{
title: "GS1生鲜果蔬追溯实施指南",
directpath: `${this.urls.gs1cn}Manage/down/GS1生鲜果蔬追溯实施指南.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1生鲜果蔬追溯实施指南.pdf`
},
{
title: "GS1肉禽追溯指南",
directpath: `${this.urls.gs1cn}Manage/down/GS1肉禽追溯指南.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1肉禽追溯指南.pdf`
},
{
title: "GS1鱼类、海鲜和水产养殖追溯指南",
directpath: `${this.urls.gs1cn}Manage/down/GS1鱼类、海鲜和水产养殖追溯指南.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1鱼类、海鲜和水产养殖追溯指南.pdf`
},
{
title: "GS1标准助力食品安全全程追溯",
directpath: `${this.urls.gs1cn}Manage/down/GS1标准助力食品安全全程追溯.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1标准助力食品安全全程追溯.pdf`
},
{
title: "食品追溯 我来教你怎么做",
directpath: `${this.urls.gs1cn}Manage/down/食品追溯我来教你怎么做.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/食品追溯我来教你怎么做.pdf`
},
{
title: "GS1标准在食品安全领域中的应用",
directpath: `${this.urls.gs1cn}Manage/down/GS1全球追溯标准在食品安全领域中的应用.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/GS1全球追溯标准在食品安全领域中的应用.pdf`
},
{
title: "中国食品的跨国追溯",
directpath: `${this.urls.gs1cn}Manage/down/中国食品的跨国追溯.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/中国食品的跨国追溯.pdf`
},
{
title: "商品条码食品安全追溯案例集",
directpath: `${this.urls.gs1cn}Manage/down/shangpintiaomaanquanzhuisuanliji.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/shangpintiaomaanquanzhuisuanliji.pdf`
},
{
title: "乳制品、熟食品与烘烤食品追溯实施指南（美国）",
directpath: `${this.urls.gs1cn}Manage/down/ruzhipinshushipin.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/ruzhipinshushipin.pdf`
},
]
},
......
src/views/News/MCommerce.vue
......@@ -4,7 +4,7 @@
<div class="container">
<div class="down" style="padding:20px 30px;">
<p>全世界超过四十亿人正在应用移动电话。移动电话正在成为企业和消费者互动的重要渠道。今天的移动电话可以与条码“对话” ，读取无线射频识别（RFID）标签，并访问互联网。 通过使用移动电话对产品标识的读取，消费者就可获得有关这个产品的服务和信息，在明白消费的同时，增进消费者与品牌信任。</p>
<p>移动商务专题：<a :href="`${urls.gs1cn}2012/MobileCom/index.html`">{{urls.gs1cn}}2012/MobileCom/index.html</a></p>
<p>移动商务专题：<a :href="`${urls.gs1cnTwo}2012/MobileCom/index.html`">{{urls.gs1cnTwo}}2012/MobileCom/index.html</a></p>
</div>
<div class="down">
<span style="margin:0 0 10px;font-size:14px;display:inline-block">资料下载</span>
......@@ -65,7 +65,7 @@ export default {
this.list2=[
{
title:'移动商务（宣传折页）',
directpath: `${this.urls.gs1cn}Manage/down/20130620GS1 MobileCom.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/20130620GS1 MobileCom.pdf`
}
]
},
......
src/views/News/Other.vue
......@@ -63,11 +63,11 @@ export default {
mounted(){
this.list2=[{
title:'《建材行业商品条码应用指南》',
directpath: `${this.urls.gs1cn}Manage/down/建材行业商品条码应用指南.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/建材行业商品条码应用指南.pdf`
},
{
title:' 服装行业商品条码应用指南',
directpath: `${this.urls.gs1cn}Manage/down/服装行业商品条码应用指南.pdf`
directpath: `${this.urls.gs1cnTwo}Manage/down/服装行业商品条码应用指南.pdf`
}]
},
methods:{
......
src/views/News/index.vue
......@@ -76,7 +76,7 @@
</div>
<div class="row">
<div class="col-lg-8">
<img src="../../assets/image/news/sdzt-tp1.png" alt="" />
<img src="../../assets/image/news/sdzt-tp1.png" alt="" @click="goDepth" />
</div>
<div class="col-lg-4">
<ul v-if="depthList.length > 0">
......@@ -96,14 +96,14 @@
<div class="row">
<div class="col-lg-4">
<ul v-if="videoList.length > 0">
<li v-for="(tmp, i) in videoList" :key="i" @click="goInfo(tmp.id)">
<li v-for="(tmp, i) in videoList" :key="i" @click="getVideoInfo(tmp.id)">
<span></span><span>{{tmp.title}}</span>
</li>
</ul>
<span v-else>暂无数据</span>
</div>
<div class="col-lg-8">
<img src="../../assets/image/news/jcsp-tp1.png" alt="" />
<img src="../../assets/image/news/jcsp-tp1.png" alt="" @click="goVideo" />
</div>
</div>
</div>
......@@ -137,6 +137,7 @@
</div>
</template>
<script>
import { mapMutations } from "vuex";
export default {
data() {
return {
......@@ -288,21 +289,20 @@ export default {
that.centerList = result
})
// 精彩视频
this.initListFn(7,10).then(function(result) {
that.videoList = result
})
this.videoListFn()
//地方动态
this.initListFn(6,7).then(function(result) {
that.localList = result
})
//深度专题
this.initListFn(7,9).then(function(result) {
that.depthList = result
})
this.depthListFn();
//top
this.newsTop10()
},
methods:{
...mapMutations({
setMatche: "setMatche",
}),
goNewPic(){
this.$router.push({
path: '/News/PicNews',
......@@ -351,6 +351,32 @@ export default {
}
},
async depthListFn() {
const params = {
page: 1,
limit: 7,
};
const listRes =
await this.$api.news.sdztList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.depthList = data.list
}
},
async videoListFn() {
const params = {
page: 1,
limit: 7,
};
const listRes =
await this.$api.news.jcspList(params);
const { returnCode, data } = listRes;
if (returnCode === "0") {
this.videoList = data.list
}
},
// 详情
goInfo(id){
console.log(id,'id')
......@@ -359,6 +385,7 @@ export default {
});
window.open(link.href,'_blank')
},
// top列表
async newsTop10() {
const policyListRes =
......@@ -370,6 +397,24 @@ export default {
}
},
getVideoInfo(id,directpath){
if(directpath&&directpath!==''&& directpath.length>0){
window.open(directpath,'_blank');
}else{
const matche = [
{
name: "精彩视频",
path: "/News/Video",
}
];
this.setMatche(matche);
let link = this.$router.resolve({
path: `/News/msgVideo?id=${id}`,
});
window.open(link.href,'_blank')
}
}
}
};
</script>
......
src/views/Org/GS1Members.vue
......@@ -39,11 +39,15 @@
</template>
<script>
import cywz from "./comps/cywz.vue";
import { mapState } from "vuex";
export default {
components: {
cywz,
},
computed: {
...mapState(["urls"]),
},
data() {
return {
currentList: [],
......@@ -265,7 +269,7 @@ export default {
},
{
name: '中国',
url: 'http://www.gs1cn.org'
url: window.location.origin
},
{
name: '吉尔吉斯斯坦',
......
src/views/Search/external.vue
<template>
<div class="search-content">
<div class="banner-box">
<!-- <img src="./img/query_external_banner.jpeg"-->
<!-- @click="openUrl(`${urls.gs1cn}Manage/down/Import_Data_Guideline.pdf`)"/>-->
<img src="./img/query_external_banner.jpeg"
@click="openUrl(`http://www.gs1cn.org/Manage/down/Import_Data_Guideline.pdf`)"/>
@click="openUrl(`${urls.gs1cnTwo}Manage/down/Import_Data_Guideline.pdf`)"/>
</div>
<div class="title">境外条码信息查询</div>
<div class="body">
......@@ -12,30 +10,30 @@
<el-form label-position="left" label-width="180px" :model="search">
<el-form-item label="境外商品条码信息查询：">
<el-input
v-model="search.code"
placeholder="请输入正确的境外商品条码！"
class="w240"
v-model="search.code"
placeholder="请输入正确的境外商品条码！"
class="w240"
></el-input>
</el-form-item>
<el-form-item label="验证码：">
<div class="y-center">
<el-input
v-model="search.captcha"
placeholder="请输入验证码"
class="w160"
v-model="captcha"
placeholder="请输入验证码"
class="w160"
></el-input>
<div class="validate-code">
<img :src="captchaPath" @click="getCaptcha()" alt="" />
<img :src="captchaPath" @click="getCaptcha()" alt=""/>
<!-- <img src="../../assets/image/validate.jpg" alt=""/> -->
</div>
<el-button
style="margin-left: 40px"
type="primary"
@click="handleSearch"
>查询
style="margin-left: 40px"
type="primary"
@click="handleSearch"
>查询
</el-button>
</div>
</el-form-item>
......@@ -47,11 +45,11 @@
<template v-if="result">
<div class="company-info">
<el-table
:data="result"
header-cell-class-name="search-table-hc"
style="width: 100%"
:data="result"
header-cell-class-name="search-table-hc"
style="width: 100%"
>
<el-table-column prop="address.name" label="企业名称"></el-table-column>
<el-table-column prop="gs1CompanyPrefixLicensee.partyName" label="企业名称"></el-table-column>
<el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GTIN"></el-table-column>
<el-table-column prop="address.streetAddressOne" label="地址"></el-table-column>
<el-table-column prop="address.city" label="城市"></el-table-column>
......@@ -66,7 +64,7 @@
<div class="notice">
<div class="title">友情提示</div>
<div class="content-wrapper">
<img src="./img/query-external-barcode.png" align="right" alt="" />
<img src="./img/query-external-barcode.png" align="right" alt=""/>
<p>
1、目前，国际物品编码组织（GS1）已将690至697之间的前缀码分配给中国物品编码中心使用，通常以这些前缀码开始的厂商识别代码都是由中国物品编码中心负责分配和管理的；以其他前缀码开始的则由境外GS1成员组织负责，一般称为"境外条码"，以下为您提供了境外商品条码信息的查询工具，请根据提示进行相关查询。欲了解GS1分配的前缀码，请点击：
<a href="/search/country" target="_blank" style="color: #5AC8FA;">了解更多 >></a>
......@@ -79,13 +77,13 @@
<script>
import validation from "@/views/Search/validation";
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
mixins: [validation],
data() {
return {
search: { code: "" },
search: {code: ""},
searchCodeShow: "",
showResult: false,
result: null,
......@@ -96,20 +94,20 @@ export default {
},
methods: {
openUrl(url) {
window.open(url, '_black')
window.open(url, '_blank')
},
async handleSearch() {
async handleSearch() {
this.searchCodeShow = this.search.code;
this.showResult = true;
const params = {
"code": this.search.code,
"type": "GTIN",
"requestedLanguage":"en",
"captcha":this.captcha,
"uuid":this.uuid
"requestedLanguage": "en",
"captcha": this.captcha,
"uuid": this.uuid
};
const searchGlnRes = await this.$api.search.searchGln(params);
const { returnCode, data } = searchGlnRes;
const {returnCode, data} = searchGlnRes;
if (returnCode === "0") {
if (data.returnCode === '0') {
this.result = [data];
......@@ -122,7 +120,7 @@ export default {
"您输入的商品条码格式不正确，请确认后重试。";
this.result = null;
}
this.getCaptcha();
this.getCaptcha();
},
},
};
......@@ -133,6 +131,7 @@ export default {
.banner-box {
width: 100%;
height: auto;
> img {
width: 100%;
height: auto;
......@@ -142,6 +141,7 @@ export default {
.product-info {
margin-top: -15px;
.left {
.row_ {
display: flex;
......
src/views/Service/Partners/caseList.vue
......@@ -5,16 +5,16 @@
<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="请选择"
style="width: 100%"
size="small"
v-model="search.service"
placeholder="请选择"
>
<el-option
v-for="item in serviceList"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in serviceList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
......@@ -22,7 +22,8 @@
<div class="col-lg-4 text-left">
<el-button type="primary" size="small" @click="casesFrontList"
>搜索</el-button
>搜索
</el-button
>
</div>
......@@ -34,10 +35,10 @@
</li>
</ul>
<pages
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
@getLimit="receivePagesChild"
:currPage="pageParams.currPage"
:pageSize="pageParams.pageSize"
:total="pageParams.total"
@getLimit="receivePagesChild"
/>
</div>
</div>
......@@ -45,7 +46,7 @@
</template>
<script>
import { mapMutations } from "vuex";
import {mapMutations} from "vuex";
import pages from "../../comps/pages2.vue";
export default {
......@@ -63,18 +64,18 @@ export default {
service: "",
},
serviceList: [
{ value: "", label: "全部服务行业" },
{ value: "医疗", label: "医疗" },
{ value: "零售", label: "零售" },
{ value: "电子商务", label: "电子商务" },
{ value: "食品烟酒", label: "食品烟酒" },
{ value: "物流", label: "物流" },
{ value: "服装", label: "服装" },
{ value: "快速消费品", label: "快速消费品" },
{ value: "消费电子产品", label: "消费电子产品" },
{ value: "制造和零部件", label: "制造和零部件" },
{ value: "建材", label: "建材" },
{ value: "其他", label: "其他" },
{value: "", label: "全部服务行业"},
{value: "医疗", label: "医疗"},
{value: "零售", label: "零售"},
{value: "电子商务", label: "电子商务"},
{value: "食品烟酒", label: "食品烟酒"},
{value: "物流", label: "物流"},
{value: "服装", label: "服装"},
{value: "快速消费品", label: "快速消费品"},
{value: "消费电子产品", label: "消费电子产品"},
{value: "制造和零部件", label: "制造和零部件"},
{value: "建材", label: "建材"},
{value: "其他", label: "其他"},
],
list: [],
};
......@@ -88,6 +89,8 @@ export default {
}),
// 点击列表跳转详情
handelJumpMsg(msg) {
const prefix = 'http://www.gs1cn.org'
msg.brief = msg.brief.replace(new RegExp('src="/UserFiles/Image', 'g'), `src="${prefix}/UserFiles/Image`);
this.setPartnersMsg(msg);
this.$router.push({
path: "/Service/Partners/content",
......@@ -107,8 +110,8 @@ export default {
service: this.search.service,
};
const serviceCasesFrontListRes =
await this.$api.service.serviceCasesFrontList(params);
const { success, data } = serviceCasesFrontListRes;
await this.$api.service.serviceCasesFrontList(params);
const {success, data} = serviceCasesFrontListRes;
console.log(serviceCasesFrontListRes, "serviceCasesFrontListRes");
if (success) {
console.log(data, "案例介绍");
......
src/views/Service/Partners/content.vue
......@@ -17,7 +17,7 @@
</template>
<script>
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
computed: {
......@@ -31,9 +31,9 @@ export default {
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: {},
......@@ -44,11 +44,13 @@ export default {
.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;
......@@ -56,30 +58,41 @@ export default {
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;
img {
max-width: 95%;
}
p {
text-indent: 25px;
font-size: 14px;
font-weight: 400;
color: #414345;
}
.strong {
font-size: 14px;
font-weight: bold;
......
src/views/Service/Partners/join.vue
......@@ -158,12 +158,12 @@
<p><i class="bi bi-cloud-download" style="color: #008dbd;margin-right: 4px;"></i>附件：</p>
<ul style="list-style: none;">
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/关于开展GS1标准服务提供商项目的通知.pdf">一、关于开展GS1标准服务提供商项目的通知</a></p></li>
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/GS1标准服务提供商项目规则.pdf">二、GS1标准服务提供商项目规则</a></p></li>
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/GS1标准服务提供商准入审核标准.pdf">三、GS1标准服务提供商准入审核标准</a></p></li>
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/GS1标准服务提供商注册登记表.pdf">四、GS1标准服务提供商注册登记表</a></p></li>
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/GS1标准服务提供商续期审核标准.pdf">五、GS1标准服务提供商续期审核标准</a></p></li>
<li><p><a href="http://www.gs1cn.org/Service/Partners/download/GS1标准服务提供商信息变更登记表.pdf">六、GS1标准服务提供商信息变更登记表</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/关于开展GS1标准服务提供商项目的通知.pdf`">一、关于开展GS1标准服务提供商项目的通知</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/GS1标准服务提供商项目规则.pdf`">二、GS1标准服务提供商项目规则</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/GS1标准服务提供商准入审核标准.pdf`">三、GS1标准服务提供商准入审核标准</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/GS1标准服务提供商注册登记表.pdf`">四、GS1标准服务提供商注册登记表</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/GS1标准服务提供商续期审核标准.pdf`">五、GS1标准服务提供商续期审核标准</a></p></li>
<li><p><a :href="`${urls.gs1cnTwo}Service/Partners/download/GS1标准服务提供商信息变更登记表.pdf`">六、GS1标准服务提供商信息变更登记表</a></p></li>
</ul>
</div>
......@@ -186,6 +186,8 @@
</template>
<script>
import { mapState } from "vuex";
export default {
data() {
return {
......@@ -193,6 +195,9 @@ export default {
serviceList: [{value: '全部服务行业'}, {value: '医疗'}, {value: '零售'}, {value: '电子商务'}, {value: '食品烟酒'}, {value: '物流'}, {value: '服装'}, {value: '快速消费品'}, {value: '消费电子产品'}, {value: '制造和零部件'}, {value: '建材'}, {value: '其他'},]
}
},
computed: {
...mapState(["urls"]),
},
methods: {},
};
</script>
......
src/views/Service/book.vue
......@@ -6,7 +6,7 @@
<el-tab-pane label="条码图书" name="first">
<div class="book-card" :key="i" v-for="(item,i) in bookList">
<div class="book-img">
<img :src="item.graph" alt="">
<img :src="prefix+item.graph" alt="">
</div>
<div class="book-content">
<div class="title">{{ item.prename }}</div>
......@@ -40,6 +40,10 @@
<img src="./img/ios.png" alt="">
<a target="_blank" :href="item.ios">iphone</a>
</div>
<div v-if="item.local">
<a target="_blank" :href="item.local">本地下载</a>
</div>
</div>
</div>
<div v-if="item.qrcode" class="qr-code">
......@@ -54,7 +58,7 @@
<script>
import pages from "../comps/pages.vue";
import { mapState } from "vuex";
import {mapState} from "vuex";
export default {
components: {pages},
......@@ -64,6 +68,7 @@ export default {
data() {
return {
activeName: 'second',
prefix: 'http://www.gs1cn.org/Knowledge/img/',
appList: [
{
name: '中国物品编码中心',
......@@ -77,8 +82,9 @@ export default {
name: '汉信码生成工具V2.1',
icon: require('./img/hxcode-icon.png'),
desc: '生成识读功能',
// android: `${this.urls.gs1cn}Manage/down/%E6%B1%89%E4%BF%A1%E7%A0%81%E7%94%9F%E6%88%90%E5%B7%A5%E5%85%B7V2.1.rar`,
// ios: `${this.urls.gs1cn}Manage/down/%E6%B1%89%E4%BF%A1%E7%A0%81%E7%94%9F%E6%88%90%E5%B7%A5%E5%85%B7V2.1.rar`,
android: 'http://www.anzhi.com/soft_969237.html',
ios: `https://apps.apple.com/us/app/han-xin-er-wei-ma/id665768613`,
local: 'http://www.gs1cn.org/Manage/down/%E6%B1%89%E4%BF%A1%E7%A0%81%E7%94%9F%E6%88%90%E5%B7%A5%E5%85%B7V2.1.rar',
},
{
name: '条码追溯',
......
src/views/User/index.vue
......@@ -3,7 +3,7 @@
<div class="gs-entry">
<div class="header">
<div class="content">
<img src="./img/logo.png" alt="">
<img @click="$router.push({path:'/'})" src="./img/logo.png" alt="">
</div>
</div>
<div class="body">
......
src/views/User/login.vue
......@@ -44,6 +44,8 @@
<el-button type="text" @click="$router.push({name:'reset-pass'})">忘记密码</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" @click="$router.push({name:'register'})">注册</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" @click="$router.push({path:'/'})">首页</el-button>
</el-form-item>
</el-form>
</div>
......
src/views/User/register.vue
......@@ -131,9 +131,12 @@ export default {
"passWord": this.form.password,
"passWord_repeat": this.form.rePassword,
}).then(res => {
if(res.success){
if (res.success) {
this.$message({type: 'success', message: '注册成功'});
}else{
setTimeout(()=>{
window.location.href = '/login'
},300)
} else {
this.$message({type: 'error', message: res.returnMsg || '注册失败，请联系管理员'});
}
}).catch(err => {
......@@ -153,7 +156,7 @@ export default {
"phone": this.form.mobile,
}).then(res => {
console.log(res)
if(res.success){
if (res.success) {
this.$message({type: 'success', message: '发送成功'});
this.hasSent = true;
this.timer = setInterval(() => {
......@@ -164,8 +167,8 @@ export default {
this.hasSent = false;
}
}, 1000);
}else{
} else {
this.$message({type: 'error', message: res.returnMsg || '发送失败'});
}
}).catch(err => {
console.log(err)
......
src/vuex/store.js
......@@ -14,8 +14,11 @@ import {
const state = {
urls: {
host: window.location.host,
origin: window.location.origin,
ancc: 'http://www.ancc.org.cn/',
gs1cn: 'http://www.gs1cn.org/',
gs1cnOne: 'www.gs1cn.org',
gs1cnTwo: 'http://www.gs1cn.org/',
},
matche: localStorage.getItem('matche') ? JSON.parse(localStorage.getItem('matche')) : [],
};
......
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