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

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/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 = [
+       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;