bug修复

src/components/layout/topBanner.vue

@@ -20,7 +20,7 @@
       <div class="top-banner-item tb-hover">咨询电话：400-7000-690</div>
       <div class="top-banner-item">
         <img src="../../assets/image/head/wx.png" alt="" />
-        <a class="tb-hover" target="_blank" :href="`${urls.ancc}gs1cnweixin.aspx`">官方微信</a>
+        <a class="tb-hover" target="_blank" href="/Home/wxcode">官方微信</a>
       </div>
       <div class="top-banner-item">
         <img src="../../assets/image/head/xlwb.png" alt="" />

src/router/index.js

@@ -39,6 +39,11 @@ const routes = [{
         component: () => import("@/views/Home/sousuo"),
       },
       {
+        path: "/Home/wxcode",
+        name: "wxcode",
+        component: () => import("@/views/Home/wxcode"),
+      },
+      {
         path: "/Org",
         name: "Org",
         meta: {

src/views/BarCode/SSCC.vue

@@ -281,6 +281,20 @@ export default {
 };
 </script>
 <style>
+@media screen and (max-width: 992px) {
+  .corppay .generate_area .operate_button{
+    width: 60%!important;
+    margin-top: 90px!important;
+    margin-left: 20%!important;
+  }
+  .AI_form_inline.el-select, .AI_form_inline.el-select .el-input, .AI_form_inline.el-select .el-input .el-input__inner,.CT1_form_inline.el-input, .CT1_form_inline.el-input .el-input__inner{
+    width: 200px!important;
+  }
+  .code-form-inline{
+    height: auto  !important;;
+  }
+
+}
 /* 去掉number类型自带的加减按钮 */
 .classname::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {

src/views/Home/wxcode.vue

+<template>
+  <div class="org container">
+   
+    <div class="row status-container">
+      <h3 class="title-style">中国物品编码中心官方微信</h3>
+      <div class="showHtml">
+        <p style="margin-bottom: 20px;"><img src="../../assets/image/head/gs1cnweixin.jpg" alt="" style="margin-top: 15px;" /></p>
+        <p style="font-size: 14px; text-indent: 28px">微信用户可通过微信账号搜索“中国编码”或扫描微信二维码关注公众号。</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+@media screen and(min-width: 992px) {
+}
+@media screen and (max-width: 992px) {
+}
+.showHtml {
+  img {
+    max-width: 100%;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.org {
+  padding-bottom: 20px;
+  .title-style {
+    width: 100%;
+   text-align: center;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    color: #C60;
+    font-size: 24px;
+    font-weight: 800;
+    border-bottom: 1px solid #b2b2b8;
+  }
+  .status-container {
+     border-top: 7px solid #002c6c;
+    background: #fff;
+    padding: 0 20px;
+    > div {
+      font-size: 14px;
+      padding-bottom: 30px;
+      word-wrap: break-word;
+      word-break: break-all;
+    }
+    .showHtml {
+      width: 100%;
+      line-height: 24px;
+      font-size: 14px;
+      // text-indent: 28px;
+      color: #454545;
+      text-align: center;
+        font-family: 'Microsoft YaHei, Tahoma, Helvetica, Arial,sans-serif';
+
+    }
+  }
+}
+</style>
\ No newline at end of file

src/views/Knowledge/Statute.vue

@@ -19,7 +19,7 @@
                   <td style="width:50%">
                     <ul>
                       <li>
-                        <a @click="getInfo(item.id,item.directpath)" role="button" > {{item.title}}</a>
+                        <a @click="getInfo(item.id,item.directpath,1)" role="button" > {{item.title}}</a>
                       </li>
                     </ul>
                     </td>
@@ -38,7 +38,7 @@
         <div class="listStyle xgbz">
           <div class="title">相关标准</div>
           <ul>
-            <li v-for="(item,i) of ycList" :key="i" @click="getInfo(item.id,item.directpath)">
+            <li v-for="(item,i) of ycList" :key="i" @click="getInfo(item.id,item.directpath,2)">
               <a  role="button" > {{item.title}}</a>
             </li>
           </ul>
@@ -49,7 +49,7 @@
   </div>
 </template>
 <script>
-
+import { mapMutations } from "vuex";
 import breadcrumb from "../comps/breadcrumb.vue";
 import pages from "../comps/pages2.vue";
 export default {
@@ -79,6 +79,9 @@ export default {
     this.ycListFn()
   },
   methods:{
+    ...mapMutations({
+      setMatche: "setMatche",
+    }),
     // 政策法规列表
     async policyListFn(page,limit) {
       const params = {
@@ -109,7 +112,27 @@ export default {
       
     },
    
-    getInfo(id,directpath){
+    getInfo(id,directpath,type){
+      // const matche=[]
+      // if(type===1){
+      //   matche = [
+      //   {
+      //     name: "政策法规",
+      //     path: "/Knowledge/Statute",
+      //   }
+        
+      // ];
+      // }else if(type===2){
+      //   matche = [
+      //     {
+      //       name: "标准文献",
+      //       path: "/Knowledge/Standard",
+      //     }
+      //   ];
+        
+      // }
+      // this.setMatche(matche);
+      
       if(directpath&&directpath!==''&& directpath.length>0){
         window.open(directpath,'_blank');
       }else{

src/views/Knowledge/Statuteinfo.vue

@@ -8,6 +8,7 @@
   </div>
 </template>
 <script>
+import { mapState } from "vuex";
 import breadcrumb from "../comps/breadcrumb.vue";
 import pages from "../comps/pages2.vue";
 export default {
@@ -21,10 +22,13 @@ export default {
       id: this.$route.query.id,
       content: "",
       title: "",
+      breadcrumb: [{ name: "知识中心", path: "/Knowledge" }],
     };
   },
     computed: {
-    routes() {},
+    ...mapState({
+      matche: (state) => state.matche,
+    }),
   },
   created() {
     this.policyInfoFn();
@@ -43,12 +47,19 @@ export default {
         this.loading = false;
         this.content = data.content;
         this.title = data.title;
+        if(data.class1=='法律法规'){
           this.$store.commit("system/SET_BREADCRUMB", [
             { name: "知识中心", path: "/Knowledge" },
             { name: "政策法规", path: "/Knowledge/Statute" },
             { name: this.title },
           ]);
-        console.log(1);
+        }else if(data.class1=='相关标准'){
+          this.$store.commit("system/SET_BREADCRUMB", [
+            { name: "知识中心", path: "/Knowledge" },
+            { name: "标准文献", path: "/Knowledge/Standard" },
+            { name: this.title },
+          ]);
+        }
       }
     },
   },

src/views/Knowledge/article.vue

@@ -25,6 +25,7 @@ export default {
       title: "",
       showtime: "",
       breadcrumb: [{ name: "技术与标准", path: "/Knowledge" }],
+      matcheArr:[]
     };
   },
   computed: {
@@ -41,7 +42,7 @@ export default {
       val = val.substring(0, val.indexOf(" "));
       return val;
     },
-    // 政策法规列表
+    //
     async initInfoFn() {
       const params = {
         id: this.id,
@@ -53,7 +54,87 @@ export default {
         this.content = data.content;
         this.title = data.title;
         this.showtime = data.inputdate;
-        this.breadcrumb = this.breadcrumb.concat(this.matche);
+        let knowledgecategoryid=data.knowledgecategoryid
+        if(knowledgecategoryid== "40" || knowledgecategoryid== "43" ||knowledgecategoryid== "44" || knowledgecategoryid== "61" || knowledgecategoryid=="62" || knowledgecategoryid == "64"){
+          //商品条码
+          this.matcheArr=[
+            {
+              name: "商品条码",
+              path: "/Knowledge/GS1System/goodsGln",
+            }
+          ]
+        }else if(knowledgecategoryid== "83" || knowledgecategoryid == "84"){
+          //产品电子代码（EPC）
+          this.matcheArr=[
+            {
+              name: "产品电子代码（EPC）",
+              path: "/Knowledge/GS1System/goodsEpc",
+            }
+          ]
+        }else if(knowledgecategoryid== "85" || knowledgecategoryid == "86"){
+          //全球数据同步（GDS）
+          this.matcheArr=[
+            {
+              name: "全球数据同步（GDS）",
+              path: "/Knowledge/GS1System/goodsGDS",
+            }
+          ]
+        }else if(knowledgecategoryid== "95" || knowledgecategoryid== "103" ||knowledgecategoryid== "215" || knowledgecategoryid == "109" ||knowledgecategoryid== "108" || knowledgecategoryid == "107" ||knowledgecategoryid== "106"){
+          //全球位置编码（GLN）
+          this.matcheArr=[
+            {
+              name: "全球位置编码（GLN）",
+              path: "/Knowledge/GS1System/goodsPosition",
+            }
+          ]
+        }else if(knowledgecategoryid== "93" || knowledgecategoryid== "98"){
+          //自行车编ma
+          this.matcheArr=[
+            {
+              name: "自行车编码",
+              path: "/Knowledge/GS1System/zxcbm",
+            }
+          ]
+        }else if( knowledgecategoryid == "94" || knowledgecategoryid== "96"){
+          // 动物编码
+          this.matcheArr=[
+            {
+              name: "动物编码",
+              path: "/Knowledge/GS1System/dwbm",
+            }
+          ]
+        }else  if( knowledgecategoryid == "45" || knowledgecategoryid == "46" ||knowledgecategoryid == "48" || knowledgecategoryid == "49" ||knowledgecategoryid == "71"){
+          //二维条码
+          this.matcheArr=[
+            {
+              name: "二维条码",
+              path: "/Knowledge/GS1System/ewbm",
+            }
+          ]
+        }else if(knowledgecategoryid == "81" || knowledgecategoryid == "82"){
+          //高效消费者响应（ECR）
+          this.matcheArr=[
+            {
+              name: "高效消费者响应（ECR）",
+              path: "/Knowledge/GS1System/gxfECR",
+            }
+          ]
+        }else if(knowledgecategoryid == "79" || knowledgecategoryid == "80"){
+          //ebXML
+          this.matcheArr=[
+            {
+              name: "ebXML",
+              path: "/Knowledge/GS1System/ebxml",
+            }
+          ]
+        }else{
+          
+           this.matcheArr=[
+            { name: "技术知识", path: "/Knowledge/" }
+          ]
+          //其他
+        }
+        this.breadcrumb = this.breadcrumb.concat(this.matcheArr);
         this.breadcrumb.push({
           name: this.title,
         });

src/views/Service/book.vue

@@ -139,10 +139,17 @@ export default {
         pageCount: 1,
         total: 10,
       },
+      id:this.$route.query.id||''
     }
   },
   created() {
+    if(this.id){
+      this.activeName='first'
+    }else{
+      this.activeName='second'
+    }
     this.getBooks()
+    
   },
   methods: {
     showBookDetail(book) {
@@ -151,7 +158,7 @@ export default {
     },
 
     async getBooks(page = 1) {
-      const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize})
+      const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize,id:Number(this.id)})
       const {returnCode, data} = res;
       if (returnCode === "0") {
         this.bookList = data.list