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

src/components/layout/topBanner.vue

@@ -19,7 +19,7 @@
         <a
           class="tb-hover"
           target="_blank"
-          href="http://www.ancc.org.cn/gs1cnweixin.aspx"
+          :href="`${urls.ancc}gs1cnweixin.aspx`"
           >官方微信</a
         >
       </div>
@@ -37,8 +37,13 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "topBanner",
+  computed: {
+    ...mapState(["urls"]),
+  },
   methods: {
     handelSearch() {
       this.$router.push({

src/views/Business/Animalcode.vue

@@ -18,7 +18,7 @@
             </p>
             <p>
               <strong
-                ><a href="http://www.gs1cn.org/Manage/animalRFID.aspx" target="_blank"
+                ><a :href="`${urls.gs1cn}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="http://www.gs1cn.org/Manage/animalDJ.htm" target="_blank">
+              <a :href="`${urls.gs1cn}Manage/animalDJ.htm`" target="_blank">
                 <img
                   src="../../assets/image/business//dengji-pic-s.jpg"
                   alt="国家动物代码动物管理者注册登记表"
@@ -96,6 +96,7 @@ import bgxz from "./copms/bgxz.vue";
 import dffzjg from "./copms/dffzjg.vue";
 import zcfg from "./copms/zcfg.vue";
 import Title from "../comps/title.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
@@ -105,6 +106,9 @@ export default {
     bgxz,
     zcfg,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       animalcode: {

src/views/Business/Guide1.vue

@@ -18,7 +18,7 @@
       <div class="msg-title" ref="1-2">条码注册方式：</div>
       <p>
         线上办理：登录中国物品编码中心官网，点击“我要申请商品条码”，手机号绑定成功后，按流程操作即可。<a
-          href="http://www.gs1cn.org/manage/down/2021zcbl.pdf"
+          :href="`${urls.gs1cn}manage/down/2021zcbl.pdf`"
           target="_blank"
           style="color: Red"
           >查看操作指南</a
@@ -141,11 +141,15 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       wysqsptmCate: {

src/views/Business/Guide2.vue

@@ -81,7 +81,7 @@
         "
       >
         线上办理：登录中国商品信息服务平台，从“应用市场—条码商桥”处下单，即时支付即时下载。<a
-          href="http://www.gs1cn.org/manage/down/2021jpdz.pdf"
+          :href="`${urls.gs1cn}manage/down/2021jpdz.pdf`"
           target="_blank"
           style="color: Red"
           >查看操作指南</a
@@ -107,11 +107,15 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       wybmCate: {

src/views/Business/Training.vue

 <template>
   <div class="training container">
     <div class="row">
-      <div class="col-lg-8" >
+      <div class="col-lg-8">
         <div class="training-bj pxjh">
           <cate :father="pxjhCate"></cate>
           <div class="container">
@@ -9,7 +9,7 @@
               为更好的开展我国商品条码系统成员教育培训工作，使我国商品条码系统成员第一时间了解各地区分支机构培训时间及培训内容，现将中国物品编码中心全国分支机构培训计划进行公布。
             </p>
             <div class="pxjh-cate">
-              <span>{{year}}年度</span>
+              <span>{{ year }}年度</span>
               <button @click="jump">点击查询分支机构联系方式</button>
             </div>
             <ul class="nav nav-tabs" id="myTab" role="tablist">
@@ -84,7 +84,10 @@
             <div class="container">
               <p>尊敬的中国商品条码系统成员：</p>
               <p class="xspxgg-note">
-                当前，新冠病毒肺炎疫情已进入关键阶段，为进一步做好疫情防控，有序推进我们的技术服务工作，中国物品编码中心全国分支机构暂停现场培训，同时为系统成员提供免费的线上培训课程和相关学习资料，请点击<a href="http://www.gs1cn.org/news/article_admin.aspx?Id=9766">http://www.gs1cn.org/news/article_admin.aspx?Id=9766</a>进行查看。
+                当前，新冠病毒肺炎疫情已进入关键阶段，为进一步做好疫情防控，有序推进我们的技术服务工作，中国物品编码中心全国分支机构暂停现场培训，同时为系统成员提供免费的线上培训课程和相关学习资料，请点击<a
+                  :href="`${urls.gs1cn}news/article_admin.aspx?Id=9766`"
+                  >{{urls.gs1cn}}news/article_admin.aspx?Id=9766</a
+                >进行查看。
               </p>
             </div>
           </div>
@@ -99,12 +102,16 @@ import fzzx from "./copms/fzzx.vue";
 import { nav } from "@/components/layout/header/mock";
 import { deepFindBreadcrumb } from "@/utils/utils";
 import { link } from "@/utils/links";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
     fzzx,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       pxjhCate: {
@@ -119,35 +126,28 @@ export default {
         ico: "",
         name: "线上培训公告",
       },
-      year: '',
+      year: "",
       currentList: [],
       tabs: [
         {
           id: "one",
           name: "第一季度",
-          list: [
-          ],
+          list: [],
         },
         {
           id: "two",
           name: "第二季度",
-          list: [
-           
-          ],
+          list: [],
         },
         {
           id: "three",
           name: "第三季度",
-          list: [
-            
-          ],
+          list: [],
         },
         {
           id: "four",
           name: "第四季度",
-          list: [
-           
-          ],
+          list: [],
         },
       ],
       updateKey: new Date().getTime(),
@@ -155,12 +155,12 @@ export default {
   },
   created() {
     this.handelTab(0);
-    this.year = this.$moment(new Date()).format('YYYY');
+    this.year = this.$moment(new Date()).format("YYYY");
   },
   methods: {
     handelTab(i) {
       console.log(i, "handelTab");
-      this.getPlanBranchList(i+1);
+      this.getPlanBranchList(i + 1);
     },
     // 根据季度回去培训计划列表和详情
     async getPlanBranchList(classnum) {
@@ -173,19 +173,19 @@ export default {
       if (success) {
         this.currentList = data;
         this.updateKey = new Date().getTime();
-        console.log(this.currentList, "根据季度回去培训计划列表和详情")
+        console.log(this.currentList, "根据季度回去培训计划列表和详情");
       }
     },
     // 培训视频课程点击进入
     pxspkcHandelClick() {
-      window.open(link.pxspkc, '_blank');
+      window.open(link.pxspkc, "_blank");
     },
     jump() {
       // this.$router.push({
       //   path: "/Org/Branch",
       // });
-      window.open('/Org/Branch', '_self');
-      const result = deepFindBreadcrumb(nav, '/Org/Branch');
+      window.open("/Org/Branch", "_self");
+      const result = deepFindBreadcrumb(nav, "/Org/Branch");
       this.$store.commit("system/SET_BREADCRUMB", result.breadcrumb);
     },
   },
@@ -266,7 +266,7 @@ export default {
     font-size: 15px;
     .xspxgg-note {
       text-indent: 2em;
-      a{
+      a {
         word-break: break-all;
         color: #008dbd;
         text-decoration: none;

src/views/Business/UDI.vue

@@ -35,7 +35,7 @@
                   target="_blank"
                   >“UDI一站式服务”</a
                 >或联系<a
-                  href="http://www.gs1cn.org/Service/Partners/List.aspx"
+                  :href="`${urls.gs1cn}Service/Partners/List.aspx`"
                   target="_blank"
                   >GS1标准服务提供商</a
                 ></b
@@ -80,7 +80,7 @@
             <p>--确定是否需要直接标记</p>
             <p>
               --对条码印制质量进行检测（可联系<a
-                href="http://www.gs1cn.org/Service/jcyxz/Barcode.aspx"
+                :href="`${urls.gs1cn}Service/jcyxz/Barcode.aspx`"
                 target="_blank"
                 >中国物品编码中心质量检测部</a
               >进行测试）
@@ -149,11 +149,15 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       udiCate: {

src/views/Business/copms/bgxz.vue

@@ -13,11 +13,15 @@
 </template>
 <script>
 import cate from "../../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       bgxzCate: {
@@ -38,7 +42,7 @@ export default {
       const { returnCode, data } = businessDownLoadRes;
       if (returnCode === "0") {
         data.forEach(el => {
-          el.docfile = `http://www.gs1cn.org/manage/down/${el.docfile}`;
+          el.docfile = `${this.urls.gs1cn}manage/down/${el.docfile}`;
         });
         this.list = data;
       }

src/views/Business/ypzs.vue

@@ -73,7 +73,7 @@
             </p>
             <p>
               --对条码印制质量进行检测（可联系<a
-                href="http://www.ancc.org.cn/Service/jcyxz/Barcode.aspx"
+                :href="`${urls.ancc}Service/jcyxz/Barcode.aspx`"
                 target="_blank"
                 >中国物品编码中心质量检测部</a
               >进行测试）
@@ -136,11 +136,15 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
     cate,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       ypzsCate: {

src/views/Djwh/index.vue

@@ -17,7 +17,7 @@
               <div class="col-lg-5 left-img">
                 <div class="border-div">
                     <a href="https://www.12371.cn/special/19jlzqh/">
-                      <img src="http://www.gs1cn.org/djwh/images/19jlzqh.jpg" alt="">
+                      <img :src="`${urls.gs1cn}djwh/images/19jlzqh.jpg`" alt="">
                     </a>
                     <a href="http://www.samr.gov.cn/zt/bwcx/">
                       <img src="../../assets/image/djwh/19thpic1.jpg" alt="">
@@ -154,7 +154,7 @@
   </div>
 </template>
 <script>
-import { mapMutations } from "vuex";
+import { mapState, mapMutations } from "vuex";
 import Footer from "./comps/footer.vue";
 
 export default {
@@ -176,8 +176,8 @@ export default {
     };
   },
   computed: {
-    routes() {
-    },
+    ...mapState(["urls"]),
+    // routes() {},
   },
   created() {
     let that =this

src/views/Home/index.vue

@@ -553,6 +553,7 @@ import otherList from "./comps/other-list.vue";
 import notice from "./comps/notice.vue";
 import modal from "../comps/modal.vue";
 import message from "../comps/message.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
@@ -565,6 +566,9 @@ export default {
     modal,
     message,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       keywords: "",
@@ -1062,7 +1066,7 @@ export default {
       const { returnCode, data } = homePictureImageListRes;
       if (returnCode === "0") {
         data.forEach((el) => {
-          el.picFile = `http://www.gs1cn.org/news/newsimg/${el.picFile}`;
+          el.picFile = `${this.urls.gs1cn}news/newsimg/${el.picFile}`;
         });
         this.newsBanner = data;
       }
@@ -1120,7 +1124,7 @@ export default {
       if (returnCode === "0") {
         let list = [];
         data.forEach((el, i) => {
-          el.picIndexPath = `http://www.gs1cn.org/img/demo/${el.picIndexPath}`;
+          el.picIndexPath = `${this.urls.gs1cn}img/demo/${el.picIndexPath}`;
           this.smallH5Images.push(el);
           list.push(el);
           if ((i + 1) % 3 === 0) {

src/views/News/ECommerce.vue

@@ -66,10 +66,10 @@
                 </p>
                <div class="list-style">
                    <ul >
-                        <li ><a href='http://www.gs1cn.org/Manage/down/201601Ecomm.pdf' target="_blank">《电子商务商品条码应用指南》</a></li>
-                        <li ><a href='http://www.gs1cn.org/Manage/down/2016Ecommerce.pdf' target="_blank">《商品条码在电子商务领域的应用》</a></li>
-                        <li ><a href='http://www.gs1cn.org/News/viewsub.aspx?id=38' target="_blank">《ebXML标准技术规范——全球电子商务标准》</a></li>
-                        <li ><a href='http://www.gs1cn.org/Manage/down/201204GLN.pdf' target="_blank">GLN</a></li>
+                        <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>
                         </ul>
                </div>
                 
@@ -82,12 +82,15 @@
   </div>
 </template>
 <script>
-import { mapMutations } from "vuex";
+import { mapState, mapMutations } from "vuex";
 import breadcrumb from "../comps/breadcrumb.vue";
 export default {
   components: {
    breadcrumb,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       

src/views/News/FoodSafety.vue

@@ -45,7 +45,7 @@
   </div>
 </template>
 <script>
-import { mapMutations } from "vuex";
+import { mapState, mapMutations } from "vuex";
 import cate from "../comps/cate.vue";
 import Title from "../comps/title.vue";
 import list from "./comps/list.vue";
@@ -60,6 +60,9 @@ export default {
     list2,
     pages,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       bzkydtCate: {
@@ -103,44 +106,44 @@ export default {
       list: [
         {
           title: "GS1全球追溯标准（第二版）",
-          directpath:'http://www.gs1cn.org/Manage/down/GS1全球追溯标准（第二版）.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/GS1全球追溯标准（第二版）.pdf`
          
         },
         {
           title: "GS1生鲜果蔬追溯实施指南",
-          directpath:"http://www.gs1cn.org/Manage/down/GS1生鲜果蔬追溯实施指南.pdf"
+          directpath: `${this.urls.gs1cn}Manage/down/GS1生鲜果蔬追溯实施指南.pdf`
         },
         {
           title: "GS1肉禽追溯指南",
-          directpath:'http://www.gs1cn.org/Manage/down/GS1肉禽追溯指南.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/GS1肉禽追溯指南.pdf`
         },
         {
           title: "GS1鱼类、海鲜和水产养殖追溯指南",
-          directpath:'http://www.gs1cn.org/Manage/down/GS1鱼类、海鲜和水产养殖追溯指南.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/GS1鱼类、海鲜和水产养殖追溯指南.pdf`
         },
         {
           title: "GS1标准助力食品安全全程追溯",
-          directpath:'http://www.gs1cn.org/Manage/down/GS1标准助力食品安全全程追溯.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/GS1标准助力食品安全全程追溯.pdf`
         },
         {
           title: "食品追溯 我来教你怎么做",
-          directpath:'http://www.gs1cn.org/Manage/down/食品追溯我来教你怎么做.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/食品追溯我来教你怎么做.pdf`
         },
         {
           title: "GS1标准在食品安全领域中的应用",
-          directpath:'http://www.gs1cn.org/Manage/down/GS1全球追溯标准在食品安全领域中的应用.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/GS1全球追溯标准在食品安全领域中的应用.pdf`
         },
         {
           title: "中国食品的跨国追溯",
-          directpath:'http://www.gs1cn.org/Manage/down/中国食品的跨国追溯.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/中国食品的跨国追溯.pdf`
         },
         {
           title: "商品条码食品安全追溯案例集",
-          directpath:'http://www.gs1cn.org/Manage/down/shangpintiaomaanquanzhuisuanliji.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/shangpintiaomaanquanzhuisuanliji.pdf`
         },
         {
           title: "乳制品、熟食品与烘烤食品追溯实施指南（美国）",
-          directpath:'http://www.gs1cn.org/Manage/down/ruzhipinshushipin.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/ruzhipinshushipin.pdf`
         },
       ],
       tableResult:{

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="http://www.gs1cn.org/2012/MobileCom/index.html">http://www.gs1cn.org/2012/MobileCom/index.html</a></p>
+       <p>移动商务专题：<a :href="`${urls.gs1cn}2012/MobileCom/index.html`">{{urls.gs1cn}}2012/MobileCom/index.html</a></p>
       </div>
       <div class="down">
        <span style="margin:0 0 10px;font-size:14px;display:inline-block">资料下载</span>
@@ -23,6 +23,7 @@ import cate from "../comps/cate.vue";
 import Title from "../comps/title.vue";
 import list from "./comps/list.vue";
 import list2 from "./comps/list2.vue";
+import { mapState } from "vuex";
 
 
 export default {
@@ -32,6 +33,9 @@ export default {
     list,
     list2,
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       bzkydtCate: {
@@ -56,7 +60,7 @@ export default {
       list2:[
         {
           title:'移动商务（宣传折页）',
-          directpath:'http://www.gs1cn.org/Manage/down/20130620GS1 MobileCom.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/20130620GS1 MobileCom.pdf`
         }
       ],
       goDown(id,url){

src/views/News/Other.vue

@@ -26,6 +26,7 @@ import Title from "../comps/title.vue";
 import list from "./comps/list.vue";
 import list2 from "./comps/list2.vue";
 import pages from "../comps/pages2.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
@@ -35,6 +36,9 @@ export default {
     list2,
     pages
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       bzkydtCate: {
@@ -45,11 +49,11 @@ export default {
       list2:[
         {
           title:'《建材行业商品条码应用指南》',
-          directpath:'http://www.gs1cn.org/Manage/down/建材行业商品条码应用指南.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/建材行业商品条码应用指南.pdf`
         },
         {
           title:' 服装行业商品条码应用指南',
-          directpath:'http://www.gs1cn.org/Manage/down/服装行业商品条码应用指南.pdf'
+          directpath: `${this.urls.gs1cn}Manage/down/服装行业商品条码应用指南.pdf`
         }
       ],
       tableResult:{

src/views/Search/external.vue

@@ -2,7 +2,7 @@
   <div class="search-content">
     <div class="banner-box">
       <img src="./img/query_external_banner.jpeg"
-           @click="openUrl('http://www.gs1cn.org/Manage/down/Import_Data_Guideline.pdf')"/>
+           @click="openUrl(`${urls.gs1cn}Manage/down/Import_Data_Guideline.pdf`)"/>
     </div>
     <div class="title">境外条码信息查询</div>
     <div class="body">
@@ -77,6 +77,7 @@
 
 <script>
 import validation from "@/views/Search/validation";
+import { mapState } from "vuex";
 
 export default {
   mixins: [validation],
@@ -88,6 +89,9 @@ export default {
       result: null,
     };
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   methods: {
    async handleSearch() {
       this.searchCodeShow = this.search.code;

src/views/Service/book.vue

@@ -54,9 +54,13 @@
 
 <script>
 import pages from "../comps/pages.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {pages},
+  computed: {
+    ...mapState(["urls"]),
+  },
   data() {
     return {
       activeName: 'second',
@@ -73,8 +77,8 @@ export default {
           name: '汉信码生成工具V2.1',
           icon: require('./img/hxcode-icon.png'),
           desc: '生成识读功能',
-          // android: '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',
-          // ios: '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',
+          // 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`,
         },
         {
           name: '条码追溯',

src/vuex/store.js

@@ -13,6 +13,10 @@ import {
 } from './mutation-types';
 
 const state = {
+    urls: {
+        ancc: 'http://www.ancc.org.cn/',
+        gs1cn: 'http://www.gs1cn.org/',
+    },
     matche: localStorage.getItem('matche') ? JSON.parse(localStorage.getItem('matche')) : [],
 };
 const mutations = {