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

src/views/Business/copms/zxcxgj.vue

@@ -3,14 +3,14 @@
     <cate :father="zxcxgjCate"></cate>
     <div class="container" v-if="middle">
       <div class="row zxcxgj-middle">
-        <div class="col-lg-4" v-for="(tmp, i) in zxcxgjList" :key="i">
+        <div class="col-lg-4" v-for="(tmp, i) in zxcxgjList" :key="i" @click="handelJump(i)">
           <img :src="tmp.ico" alt="" class="zxcxgj-img" />
           <div class="zxcxgj-bt">{{ tmp.name }}</div>
         </div>
       </div>
     </div>
     <ul class="zxcxgj-bottom" v-else>
-      <li v-for="(tmp, i) in zxcxgjList" :key="i">
+      <li v-for="(tmp, i) in zxcxgjList" :key="i" @click="handelJump(i)">
         <img :src="tmp.ico" alt="" class="zxcxgj-img" />
         <div class="zxcxgj-bt">{{ tmp.name }}</div>
       </li>
@@ -35,26 +35,41 @@ export default {
         {
           ico: require("../../../assets/image/business/icon_tiaomaxinxichaxun.png"),
           name: "条码信息查询",
+          url: '/search/tool'
         },
         {
           ico: require("../../../assets/image/business/icon_zixingche.png"),
           name: "自行车企业代码公告查询",
+          url: '/search/bike'
         },
         {
           ico: require("../../../assets/image/business/icon_tiaomashuyuchaxun.png"),
           name: "条码术语查询",
+          url: '/search/glossary'
         },
         {
           ico: require("../../../assets/image/business/ico_xiaoyanma.png"),
           name: "校验码计算工具",
+          url: '/search/check'
         },
         {
           ico: require("../../../assets/image/business/icon_guojia.png"),
           name: "国家及地区前缀码查询",
+          url: '/search/country'
         },
       ],
     };
   },
+  methods: {
+    handelJump(i) {
+      // console.log(i, 'handelJump');
+      this.$router.push(
+        {
+          path: this.zxcxgjList[i].url,
+        }
+      )
+    }
+  },
 };
 </script>
 <style lang="scss">

src/views/News/index.vue

@@ -79,11 +79,12 @@
               <img src="../../assets/image/news/sdzt-tp1.png" alt="" />
             </div>
             <div class="col-lg-4">
-              <ul>
+              <ul v-if="depthList.length > 0">
                 <li v-for="(tmp, i) in depthList" :key="i" @click="goInfo(tmp.id)">
                  <span></span><span>{{tmp.title}}</span>
                 </li>
               </ul>
+              <span v-else>暂无数据</span>
             </div>
           </div>
         </div>
@@ -94,11 +95,12 @@
           </div>
           <div class="row">
             <div class="col-lg-4">
-              <ul>
+              <ul v-if="videoList.length > 0">
                 <li v-for="(tmp, i) in videoList" :key="i" @click="goInfo(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="" />