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

.env.production

@@ -3,5 +3,5 @@ VUE_APP_CURRENTMODE = "production"
 VUE_APP_HOST_URL = "http://192.168.0.77:9091"
 VUE_APP_API_URL = "http://192.168.0.77:9091"
 VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
-VUE_APP_CHINATM_URL = "http://192.168.0.77:8080/chinatm"
+VUE_APP_CHINATM_URL = "http://192.168.0.77:80/chinatm"
 VUE_APP_LOG = false

src/views/Business/Code1.vue

@@ -229,19 +229,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>
@@ -269,7 +273,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
   }
 }

src/views/Business/Code2.vue

@@ -148,19 +148,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>
@@ -189,7 +193,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
   }
 }

src/views/Business/Code3.vue

@@ -127,19 +127,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>

src/views/Business/Corppay.vue

@@ -177,9 +177,11 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
@@ -189,10 +191,12 @@ export default {
     // console.log(this.$route.query.id)
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>
@@ -331,7 +335,7 @@ export default {
       color: #454545;
     }
     .prominent-text {
-      color: #008DBD;
+      color: #008dbd;
     }
     .fwxmyfwnr {
       td {

src/views/Business/Guide1.vue

@@ -166,19 +166,23 @@ export default {
             console.log(this.$refs[key], "this.$refs");
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>

src/views/Business/Guide2.vue

@@ -131,19 +131,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>

src/views/Business/Guide3.vue

@@ -11,9 +11,9 @@
         <b>登录平台</b>
       </p>
       <p>
-        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
-          >{{urls.host}}</a
-        >
+        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank">{{
+          urls.host
+        }}</a>
         ，点击“成员专区”或点击“我要通报编码信息”。
       </p>
       <div class="text-center">
@@ -102,9 +102,11 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
@@ -114,10 +116,12 @@ export default {
     ...mapState(["urls"]),
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
   methods: {
     ljtbJump() {
@@ -157,7 +161,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
   }
   .text-right {

src/views/Business/Guide4.vue

@@ -89,19 +89,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
 };
 </script>
@@ -126,7 +130,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
     img {
       max-width: 100%;

src/views/Business/Guide5.vue

@@ -7,8 +7,9 @@
         <b>1、成员专区培训</b>
       </p>
       <p>
-        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
-          >{{urls.host}}</a
+        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank">{{
+          urls.host
+        }}</a
         >，点击“成员专区”，通过条码卡卡号密码登录。
       </p>
       <div class="text-center">
@@ -80,8 +81,9 @@
 
       <div class="msg-title" ref="5-2">线下培训：</div>
       <p>
-        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank"
-          >{{urls.origin}}</a
+        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank">{{
+          urls.origin
+        }}</a
         >，点击“我要培训”。
       </p>
       <div class="text-center">
@@ -93,8 +95,7 @@
         />
       </div>
       <p>
-        查看<a href="/Service/Training" target="_blank"
-          >全国分支机构培训计划</a
+        查看<a href="/Service/Training" target="_blank">全国分支机构培训计划</a
         >，选择适合方式、场次参加培训。
       </p>
       <div
@@ -137,19 +138,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
   methods: {
     ljtbJump() {
@@ -188,7 +193,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
     a {
       color: #008dbd;

src/views/Business/Guide6.vue

@@ -101,19 +101,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
   methods: {
     ljtbJump() {
@@ -152,7 +156,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
     a {
       color: #008dbd;

src/views/Business/Guide7.vue

@@ -2,17 +2,18 @@
   <div class="guide">
     <cate :father="wyzxCate"> </cate>
     <div class="guide-msg container">
-
-      <div class="msg-title" ref="7-1">企业可以通过以下几种方式与我们联系：</div>
+      <div class="msg-title" ref="7-1">
+        企业可以通过以下几种方式与我们联系：
+      </div>
       <div class="msg-title">线上咨询</div>
 
-      <p >
+      <p>
         <b>1、成员专区咨询</b>
       </p>
-      <p >
+      <p>
         <b>（1）查看常见问题</b>
       </p>
-      <p >
+      <p>
         登录中国物品编码中心网站，点击“成员专区”，通过条码卡卡号密码登录，依次点击“咨询”→“常见问题”，查看常见问题。根据业务办理、编码技术、产品信息通报等分类的常见问题方便企业快速查找。
       </p>
 
@@ -24,10 +25,10 @@
           style="margin-top: 15px; margin-bottom: 15px"
         />
       </div>
-      <p >
+      <p>
         <b>（2）在线提问</b>
       </p>
-      <p >
+      <p>
         依次点击“咨询”→“我的提问”→“新增”，填写问题标题及内容后，点击“提交”，等待工作人员回复。
       </p>
       <div class="text-center">
@@ -38,10 +39,10 @@
           style="margin-top: 15px; margin-bottom: 15px"
         />
       </div>
-      <p >
+      <p>
         <b>2、移动端咨询</b>
       </p>
-      <p >
+      <p>
         通过条码卡卡号或者手机号码登录“中国编码APP”，可 “条码咨询”和查看
         “常见问题”。填写问题标题及内容后，点击“提交”，提出问题，等待工作人员回复。
       </p>
@@ -104,19 +105,23 @@ export default {
           Object.keys(this.$refs).forEach((key) => {
             this.$refs[key].setAttribute("class", "msg-title");
           });
+          if (val.query.id) {
             const top = this.$refs[val.query.id].offsetTop;
             window.scrollTo(0, top);
             this.$refs[val.query.id].setAttribute("class", "msg-title actived");
+          }
         });
       },
       immediate: true,
     },
   },
   mounted() {
+    if (this.$route.query.id) {
       setTimeout(() => {
         const top = this.$refs[this.$route.query.id].offsetTop;
         window.scrollTo(0, top);
       }, 100);
+    }
   },
   methods: {
     ljtbJump() {
@@ -155,7 +160,7 @@ export default {
       font-size: 14px;
       color: #454545;
       font-weight: 300;
-      line-height: 24px
+      line-height: 24px;
     }
     a {
       color: #008dbd;

src/views/Business/Training.vue

@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-lg-8">
         <div class="training-bj pxjh">
-          <cate :father="pxjhCate"></cate>
+          <cate2 :father="pxjhCate"></cate2>
           <div class="container">
             <p>
               为更好的开展我国商品条码系统成员教育培训工作，使我国商品条码系统成员第一时间了解各地区分支机构培训时间及培训内容，现将中国物品编码中心全国分支机构培训计划进行公布。
@@ -57,7 +57,7 @@
       <div class="col-lg-4">
         <div class="training-bj">
           <div class="pxspkc">
-            <cate :father="pxspkcCate"></cate>
+            <cate2 :father="pxspkcCate"></cate2>
             <div class="container">
               <p>
                 系统成员可登录中国商品信息服务平台的成员专区选择在线学习服务培训视频教程，即可简单、有效、快速的学习到实用的商品条码知识，了解GS1系统并按标准使用商品条码，如需了解请按下方提示点击进入。
@@ -85,8 +85,8 @@
               <p>尊敬的中国商品条码系统成员：</p>
               <p class="xspxgg-note">
                 当前，新冠病毒肺炎疫情已进入关键阶段，为进一步做好疫情防控，有序推进我们的技术服务工作，中国物品编码中心全国分支机构暂停现场培训，同时为系统成员提供免费的线上培训课程和相关学习资料，请点击<a
-                  :href="`${urls.gs1cnTwo}news/article_admin.aspx?Id=9766`"
-                  >{{urls.gs1cnTwo}}news/article_admin.aspx?Id=9766</a
+                  :href="`${urls.origin}/News/msg?id=9766`"
+                  >{{urls.origin}}/News/msg?id=9766</a
                 >进行查看。
               </p>
             </div>
@@ -98,6 +98,7 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import cate2 from "../comps/cate2.vue";
 import fzzx from "./copms/fzzx.vue";
 import { nav } from "@/components/layout/header/mock";
 import { deepFindBreadcrumb } from "@/utils/utils";
@@ -107,6 +108,7 @@ import { mapState } from "vuex";
 export default {
   components: {
     cate,
+    cate2,
     fzzx,
   },
   computed: {

src/views/Home/comps/notice.vue

@@ -20,7 +20,7 @@
             </div>
             <div class="notice-nr-kj">
               <p class="notice-note">
-                为应对疫情，切实减轻企业负担，协助企业复工复产、渡过难关，编码中心决定自2020年3月1日至2021年12月31日，采取阶段性降费措施。<span
+                为应对疫情，切实减轻企业负担，协助企业复工复产、渡过难关，编码中心决定自2020年3月1日至2022年3月31日，采取阶段性降费措施。<span
                   @click="handelJump"
                   >点击查看收费公示表</span
                 >
@@ -89,7 +89,7 @@ export default {
       this.show = false;
     },
     handelJump() {
-      window.open("/Business/Corppaynew", "_blank");
+      window.open("/Business/Corppay", "_blank");
     },
   },
 };

src/views/Knowledge/Standard.vue

@@ -16,6 +16,7 @@
 <script>
 import Title from "../comps/title.vue";
 import pages from "../comps/pages2.vue";
+import { mapState, mapMutations } from "vuex";
 export default {
   components: {
     Title,
@@ -36,6 +37,9 @@ export default {
     this.ycListFn(this.policyList.currPage)
   },
   methods:{
+    ...mapMutations({
+      setMatche: "setMatche",
+    }),
     // 政策法规列表
     async ycListFn(page,limit) {
       const params = {
@@ -52,6 +56,13 @@ export default {
       
     },
     getInfo(id,directpath){
+       const matche = [
+          {
+            name: "标准文献",
+            path: "/Knowledge/Standard",
+          }
+        ];
+        this.setMatche(matche);
       if(directpath!==''&& directpath.length>0){
         window.open(directpath,'_blank');
       }else{

src/views/Knowledge/xts.vue

@@ -16,6 +16,7 @@
 <script>
 import Title from "../comps/title.vue";
 import pages from "../comps/pages2.vue";
+import { mapState, mapMutations } from "vuex";
 export default {
   components: {
     Title,
@@ -36,6 +37,9 @@ export default {
     this.initListFn(this.tableResult.currPage);
   },
   methods:{
+    ...mapMutations({
+      setMatche: "setMatche",
+    }),
     // 小贴士
     async initListFn(page,limit) {
       const params = {
@@ -51,6 +55,13 @@ export default {
       }
     },
     getInfo(id,directpath){
+       const matche = [
+          {
+            name: "小贴士",
+            path: "/Knowledge/xts",
+          }
+        ];
+        this.setMatche(matche);
       if(directpath&&directpath!==''&& directpath.length>0){
         window.open(directpath,'_blank');
       }else{
@@ -123,8 +134,6 @@ export default {
         cursor: pointer;
         border-bottom: 1px dashed #C5D8EE;
         font-size: 14px;
-        
-       
         width: 100%;
         :hover,:active{
           color: #F26335;

src/views/Member/index.vue

@@ -110,6 +110,7 @@ export default {
       button{
           border-radius: 4px;
       }
+      margin-bottom: 10px;
 
     }
     .listStyle-title{

src/views/News/ECommerce.vue

@@ -210,15 +210,17 @@ export default {
       
     },
     getInfo(id,directpath){
-      if(directpath&&directpath!==''&& directpath.length>0){
-        window.open(directpath,'_blank');
-      }else{
        const matche = [
           {
             name: "食品安全追溯",
             path: "/News/ECommerce",
           }
         ];
+        this.setMatche(matche);
+      if(directpath&&directpath!==''&& directpath.length>0){
+        window.open(directpath,'_blank');
+      }else{
+       
         let link = this.$router.resolve({
           path: `/News/msg?id=${id}`,
         });

src/views/News/comps/list.vue

@@ -31,11 +31,13 @@ export default {
     border-bottom: 1px dashed #c5d8ee;
     padding: 20px 0;
     margin: 0;
+     cursor: pointer;
     .list-left {
       flex: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
+      cursor: pointer;
       span {
         display: inline-block;
         &:nth-child(1) {
@@ -48,7 +50,7 @@ export default {
         &:nth-child(2) {
           flex: 1;
           @include ellipsis;
-          cursor: pointer;
+          
         }
       }
     }

src/views/News/comps/list2.vue

@@ -27,12 +27,14 @@ export default {
     justify-content: space-between;
     padding: 10px 0;
     margin: 0;
+    cursor: pointer;
     >div {
       flex: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
       font-size: 13px;
+     
       span {
         display: inline-block;
         &:nth-child(1) {

src/views/News/msg.vue

@@ -353,7 +353,7 @@ export default {
         justify-content: space-between;
         padding: 10px 0;
         margin: 0;
-
+        cursor: pointer;
         > div {
           flex: 1;
           display: flex;

src/views/Org/BranchMsg.vue

@@ -20,7 +20,7 @@
         <ul class="branchMsg-ul">
           <li class="row">
             <div class="col-lg-2 col-4">联系人:</div>
-            <div class="col-lg-10 col-8">{{msg.branchSimname}}</div>
+            <div class="col-lg-10 col-8">{{msg.personname}}</div>
           </li>
           <li class="row">
             <div class="col-lg-2 col-4">电&nbsp;&nbsp;&nbsp;&nbsp;话:</div>
@@ -48,9 +48,7 @@
           </li>
           <li class="row">
             <div class="col-lg-2 col-4">简&nbsp;&nbsp;&nbsp;&nbsp;介:</div>
-            <div class="col-lg-10 col-8">
-              {{msg.description}}
-            </div>
+            <div class="col-lg-10 col-8" v-html="msg.description"></div>
           </li>
         </ul>
       </div>
@@ -90,6 +88,7 @@ export default {
       const { success, data } = orgGetBranchDetailRes;
       if (success) {
         console.log(orgGetBranchDetailRes, "获取编码机构详情");
+        this.branchMsgCate.name = data.branchName;
         this.msg = data;
       }
     },

src/views/comps/cate.vue

@@ -20,7 +20,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .zxcxgj-cate {
   font-size: 18px;
   color: #454545;

src/views/comps/cate2.vue

+<template>
+  <div class="zxcxgj-cate">
+    <div class="container">
+      <div class="cate-left">
+        <img :src="father.ico" v-if="father.ico" /><span>{{ father.name }}</span>
+      </div>
+      <div class="cate-right">
+        <slot v-solt="right"></slot>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["father"],
+};
+</script>
+<style lang="scss" scoped>
+.zxcxgj-cate {
+  font-size: 24px;
+  color: #C60;
+  border-bottom: 1px solid #c5d8ee;
+  padding: 14px 0;
+  font-weight: bold;
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .cate-left{
+      flex: 1;
+      text-align: center;
+    }
+  }
+  img {
+    margin-right: 9px;
+  }
+}
+</style>
\ No newline at end of file