bug

.env.development

 NODE_ENV = "development"
 VUE_APP_CURRENTMODE = "development"
-VUE_APP_HOST_URL = "http://wudi.natapp1.cc"
+VUE_APP_HOST_URL = "http://116.204.118.109:9091"
 VUE_APP_API_URL = "/"
 VUE_APP_GDS_URL = "/gds"
 VUE_APP_LOG = true

.env.test

 NODE_ENV = "production"
 VUE_APP_CURRENTMODE = "test"
-VUE_APP_HOST_URL = "http://wudi.natapp1.cc"
-VUE_APP_API_URL = "http://wudi.natapp1.cc"
+VUE_APP_HOST_URL = "http://116.204.118.109:9091"
+VUE_APP_API_URL = "http://116.204.118.109:9091"
 VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
 VUE_APP_CHINATM_URL = "http://81.68.189.225:8080/chinatm"
 VUE_APP_LOG = false

src/axios/module/search.js

@@ -4,11 +4,15 @@ import {
 
 const Prefix = process.env.NODE_ENV === 'development' ? '/gs1' : '';
 
-// 条码查询—GLN查询/境外码查询
+// 条码查询—境外码查询
 const searchGln = (params = {}) => {
 	// return POST(`${Prefix}/office/codeSearch/api/gln`, params)
 	return POST(`${Prefix}/office/gTinSearch/api/gtin`, params)
 }
+// 条码查询—GLN查询
+const searchCodeGln = (params = {}) => {
+	return POST(`${Prefix}/office/codeSearch/api/gln`, params)
+}
 
 // 条码查询—缩短码查询
 const searchGetList = (params = {}) => {
@@ -49,4 +53,5 @@ export default {
 	searchCompanyChange,
 	searchBike,
 	searchGlossary,
+	searchCodeGln
 }

src/components/layout/header/HeaderBtn.vue

@@ -5,6 +5,9 @@
     </el-button>
     <el-button v-else type="primary" style="padding: 9px 30px;margin-right: 6px" size="small" @click="handleExit">退出登录
     </el-button>
+    <div class="top-banner-item tb-hover d-block d-xl-none d-lg-none" @click="handleSearch">
+      <img src="../../../assets/image/head/search.png" alt="" />
+    </div>
 
     <!-- Toggler -->
     <button class="navbar-toggler collapsed" type="button" data-toggle="collapse"
@@ -40,10 +43,16 @@ export default {
       // this.$router.push({path: "/"})
       location.href = '/'
       this.user = null
-    }
+    },
+     handleSearch () {
+      this.$router.push({
+        path: "/Home/sousuo",
+      });
+    },
   },
   created() {
     this.user = localStorage.getItem('loginInfo') ? JSON.parse(localStorage.getItem('loginInfo')) : null
+    console.log(this.user)
   },
 }
 </script>
@@ -54,5 +63,11 @@ export default {
       background: #CC3C0F;
     }
   }
+  .tb-hover{
+    >img {
+      width: 16px;
+      height: 16px;
+    }
+  }
 }
 </style>

src/components/layout/header/index.vue

@@ -163,6 +163,8 @@ export default {
 
     handleWindowClick() {
       console.log('handleWindowClick', this.fromNav, this.preActive);
+      console.log('fromNav', this.fromNav);
+       console.log('preActive', this.preActive);
       if (!this.fromNav) {
         this.showDropDown = ''
       }
@@ -175,6 +177,7 @@ export default {
     },
 
     handleNavClick(nav) {
+     
       console.log('handleNavClick', nav)
       this.showDropDown = nav.id;
       if (!nav.children || nav.children.length === 0) {
@@ -187,7 +190,9 @@ export default {
           // console.log('!this.fromDropdown', this.currentNav, nav.id)
           // 重复点击同一个nav
           if (this.currentNav === nav.id) {
-            this.currentNav = this.preActive;
+            // 不改变状态
+            // this.currentNav = this.preActive;
+            this.fromNav = true;
             this.preActive = "";
           } else {
             // 点击的是有dropdown的nav 需要保存当前激活状态
@@ -206,6 +211,10 @@ export default {
       this.fromDropdown = true;
       if (item.link.startsWith("http")) {
         window.open(item.link);
+      }else if(item.link==''){
+      // 导航link为空的
+        this.$message.error('此业务没有开通')
+
       } else {
         // console.log(item.root)
         this.updateCurrent(item.root.id);

src/views/BarCode/lawsAndNews.vue

@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       bzkydtCate: {
-        name: "标准",
+        name: "政策法规&行业资讯",
         ico: "",
       },
       tableResult: {

src/views/Business/2dcode.vue

@@ -31,7 +31,7 @@
               <dd><i></i></dd>
               <dd>
                 <p>
-                  <em>登陆</em>中国商品信息服务平台<br /><a
+                  <em>登录</em>中国商品信息服务平台<br /><a
                     href="https://www.gds.org.cn"
                     target="_blank"
                     >（ https://www.gds.org.cn）</a
@@ -63,7 +63,7 @@
               <dd><i></i></dd>
               <dd>
                 <p>
-                  <em>登陆</em>中国商品信息服务平台<a
+                  <em>登录</em>中国商品信息服务平台<a
                     href="https://www.gds.org.cn"
                     target="_blank"
                     >（https://www.gds.org.cn）</a

src/views/Business/Guide5.vue

@@ -7,9 +7,7 @@
         <b>1、成员专区培训</b>
       </p>
       <p>
-        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank">{{
-          urls.host
-        }}</a
+        登录中国物品编码中心官网<a href="www.gs1cn.org" target="_blank">www.gs1cn.org</a
         >，点击“成员专区”，通过条码卡卡号密码登录。
       </p>
       <div class="text-center">
@@ -81,10 +79,7 @@
 
       <div class="msg-title" ref="5-2">线下培训：</div>
       <p>
-        登录中国物品编码中心官网<a :href="`${urls.origin}`" target="_blank">{{
-          urls.origin
-        }}</a
-        >，点击“我要培训”。
+        登录中国物品编码中心官网<a href="www.gs1cn.org" target="_blank">www.gs1cn.org</a>，点击“我要培训”。
       </p>
       <div class="text-center">
         <img

src/views/Business/index.vue

@@ -439,10 +439,10 @@ export default {
               children: [
                 {
                   name: "收费公示",
-                  path: "/Business/Corppay",
+                  path: "/Business/Corppaynew",
                   active: "Corppaynew",
                   query: {
-                    id: "1",
+                    id: "0",
                   },
                   noneChild: true,
                 },
@@ -759,11 +759,13 @@ export default {
       } else {
         originPath = this.$route.path;
       }
+      
       const currentRoute = this.deepFindCurrentRoute(
         this.routeList,
         originPath
       );
-      // console.log(currentRoute, "currentRoute");
+
+      console.log(currentRoute, "currentRoute11112222");
       if (currentRoute.children && currentRoute.children.length > 0) {
         newRouteList = currentRoute.children;
       } else if (currentRoute.noneChild) {
@@ -772,8 +774,9 @@ export default {
       } else {
         newRouteList = this.routeList;
       }
+      console.log(newRouteList, "newRouteListnewRouteList2");
       localStorage.setItem("newRouteList", JSON.stringify(newRouteList));
-      // newRouteList = this.deepFindRouteList(this.routeList, currentPath);
+      // newRouteList = this.deepFindRouteList(this.routeList, originPath);
       console.log(newRouteList, "newRouteListnewRouteList2");
       return newRouteList;
     },

src/views/Home/comps/notice.vue

@@ -91,7 +91,7 @@ export default {
       this.show = false;
     },
     handelJump() {
-      window.open("/Business/Corppay", "_blank");
+      window.open("/Business/Corppaynew", "_blank");
     },
   },
 };

src/views/Home/index.vue

@@ -263,7 +263,7 @@
                     </div>
                     <div class="col-lg-7 chaxun-middle">
                       <el-input
-                        placeholder="请输入厂商名称"
+                        :placeholder="optionLable"
                         v-model="chaxun.keywords"
                         clearable
                       >
@@ -724,6 +724,7 @@ export default {
         options2: [],
         keywords: "",
       },
+      optionLable:'',
       chaxun2:{
         keywords: "",
       },
@@ -1004,14 +1005,18 @@ export default {
         data: [
           {
             name: "国家射频识别产品质量检验检测中心",
-            url: "http://www.spjc.org.cn/",
-            type: "link",
+            // url: "http://www.spjc.org.cn/",
+            // type: "link",
+            url: "/Org/Sites",
+            query: {
+              id: "1-2",
+            },
           },
           {
             name: "国家条码质量检验检测中心",
             url: "/Org/Sites",
             query: {
-              id: "1-2",
+              id: "1-1",
             },
           },
           {
@@ -1100,6 +1105,23 @@ export default {
       },
     };
   },
+  watch:{
+  
+    'chaxun.type': {
+        handler(newVal, oldVal) {
+            if(newVal==1){
+              this.optionLable='请输入厂商识别代码'
+            }else if(newVal==2){
+              this.optionLable='请输入厂商名称'
+            }else if(newVal==3){
+              this.optionLable='请输入厂商地址'
+            }
+        },
+        deep: true,
+        immediate: true
+    }
+
+  },
   created() {
     // console.log(this.$route, "this.$route");
     this.dzfw.push(this.dzfLastChild);
@@ -1310,8 +1332,10 @@ export default {
     },
     // 要闻、中心、地方、国际点击
     handelNewsTab(i) {
+
       if (this.news[i].link) {
         window.open(this.news[i].link, "_blank");
+        // 是外链的需要初始化
       }
     },
     // 商品全球身份证
@@ -2686,11 +2710,7 @@ export default {
       border-radius: 8px;
       img {
         width: 100%;
-        @media screen and (max-width: 765px) {
-          width: calc(100% - 40px);
-          display: block;
-          margin: 0 20px 0 20px;
-        }
+        
       }
       
     }
@@ -2810,5 +2830,8 @@ export default {
       text-align: center;
     }
   }
+  .ywzxdfgj{
+    padding: 30px 0;
+  }
 }
 </style>

src/views/Home/sousuo.vue

@@ -258,8 +258,11 @@ export default {
     .nav-tabs {
       margin: 10px 0;
       border-bottom: 1px solid #c5d8ee;
+      display: flex;
+      justify-content: flex-start;
       .nav-item {
-        margin-right: 60px;
+        width: 110px;
+        // margin-right: 60px;
         &:last-child {
           margin-right: 0;
         }

src/views/Knowledge/GS1System/dwbm.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/ebxml.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/ewbm.vue

@@ -173,7 +173,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/goodsEpc.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/goodsGDS.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/goodsGln.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/goodsPosition.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/gstd.vue

@@ -39,7 +39,7 @@ export default {
     this.$store.commit("system/SET_BREADCRUMB", [
       { name: "技术与标准", path: "/Knowledge" },
       { name: "GS1系统", path: "/Knowledge/GS1System2" },
-      { name: "GS1系统的好处" },
+      { name: "GS1系统的特点" },
     ]);
   },
 };

src/views/Knowledge/GS1System/gxfECR.vue

@@ -175,7 +175,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/GS1System/zxcbm.vue

@@ -176,7 +176,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/Statute.vue

@@ -6,7 +6,7 @@
       <div class="col-lg-8 "  >
         <div class="listStyle">
           
-          <table>
+          <table style="width:100%;table-layout: fixed">
             <thead>
                 <tr>
                   <th>标题</th>
@@ -19,7 +19,7 @@
                   <td style="width:50%">
                     <ul>
                       <li>
-                        <a @click="getInfo(item.id,item.directpath,1)" role="button" > {{item.title}}</a>
+                        <a  @click="getInfo(item.id,item.directpath,1)" role="button" > {{item.title}}</a>
                       </li>
                     </ul>
                     </td>
@@ -255,7 +255,7 @@ export default {
             }
       }
      
-      li::before{
+      a::before{
           content: "●"; 
           color: #F26335;
           margin-right: 5px;

src/views/Knowledge/article.vue

@@ -187,6 +187,7 @@ export default {
       padding-bottom: 30px;
     }
     .showHtml {
+      width: 100%;
       border-bottom: 1px solid #b2b2b8;
       padding-bottom: 30px;
       margin-bottom: 25px;
@@ -197,7 +198,16 @@ export default {
       color: #454545;
       /deep/p {
         margin: 0 0 10px;
+         
       }
+      /deep/p{
+        img{
+          width: 100%!important;
+          margin-left: -24px!important;
+          height: auto!important;
+        }
+      }
+     
     }
   }
 }

src/views/Knowledge/index.vue

@@ -9,7 +9,7 @@
           <el-select class="col-lg-2"
               v-model="chaxun.type"
               placeholder="请选择"
-              clearable
+              
             >
              <el-option value="all" label="所有分类"></el-option>
               <el-option
@@ -20,7 +20,7 @@
               >
               </el-option>
             </el-select>
-          <el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords" style="margin-left:-30px"></el-input>
+          <el-input class="col-lg-8" placeholder="请输入内容"  v-model="chaxun.keywords" style="margin-left:-30px"></el-input>
           <div class="top-form-btn col-lg-2"  @click="goKnowledgeList" style="margin-left:-15px">
             <img src="../../assets/image/home/sousuo-ico1.png" alt="" />
           </div>
@@ -86,9 +86,9 @@
                     </p>
                     <p  class="card-text"><span class="more-des"   @click="goGs1">详情>></span></p>
                     <p class="card-text gsb-btn-cnt row">
-                      <el-button type="primary" class="gsbtn col-lg-3"   @click="goBmtx">编码体系</el-button>
-                      <el-button type="primary" class="gsbtn col-lg-4"   @click="goSjzt">数据载体体系</el-button>
-                      <el-button type="primary" class="gsbtn col-lg-4"   @click="goSjjh">数据交换体系</el-button>
+                      <el-button type="primary" class="gsbtn col-lg-3 "   @click="goBmtx">编码体系</el-button>
+                      <el-button type="primary" class="gsbtn col-lg-4 "   @click="goSjzt">数据载体体系</el-button>
+                      <el-button type="primary" class="gsbtn col-lg-4 "   @click="goSjjh">数据交换体系</el-button>
                     </p>
                    
                   </div>
@@ -110,7 +110,7 @@
                 <div class="col bzwx">
                   <div class="card-body" style="padding-top:31px">
                     <p class="card-text  row">
-                      <el-button type="primary" class="cjwtbtn col-lg-4" v-for="(tmp, i) in cjwt" :key="i" @click="cjwtHandelClick(tmp)">{{tmp.name}}</el-button>
+                      <el-button type="primary" class="cjwtbtn col-lg-5" v-for="(tmp, i) in cjwt" :key="i" @click="cjwtHandelClick(tmp)">{{tmp.name}}</el-button>
                     </p>
                   </div>
                 </div>
@@ -663,6 +663,9 @@ export default {
     .knowledge-top-form {
       width: 100% !important;
     }
+     .gsbtn {
+     margin-left: 0!important;
+    }
   }
   @media screen and (max-width: 1401px) {
     .gsbtn {

src/views/Member/index.vue

@@ -4,7 +4,7 @@
 
       <div class="col-lg-9 "  >
         <div class="listStyle">
-          <div class="title">欢迎登陆系统成员服务专区</div>
+          <div class="title">欢迎登录系统成员服务专区</div>
           <p>本专区面向中国商品条码系统成员开放，专区包括线上咨询、产品管理、共享中心、课程会议及应用市场等功能。</p>
           <p>专区功能简单介绍如下：</p>
           <p>1. 线上咨询：供系统成员浏览条码常见问题并在线进行提问，问题会有专人进行回复；</p>

src/views/News/Center.vue

@@ -12,7 +12,7 @@
               {{tmp.title}}
             </div>
           </li>
-          <li  style=" height: 0" v-for="(i,a) in 4" :key="'a'+a"></li>
+          <li  style=" height: 0;margin:0" v-for="(i,a) in 4" :key="'a'+a"></li>
         </ul>
         <div class="more"><span @click="lookMore">更多></span></div>
       </div>
@@ -117,12 +117,19 @@ export default {
 .Center {
   @media screen and (min-width: 992px) {
     .picNews-ul {
-      justify-content: space-between;
+      justify-content: space-between!important;
     }
   }
   @media screen and (max-width: 992px) {
     .picNews-ul {
-      justify-content: space-around;
+      justify-content: space-around!important;
+    }
+  }
+  @media screen and (max-width: 1400px) and (min-width: 992px) {
+    .picNews-ul {
+      li{
+        width: 24%!important;
+      }
     }
   }
 }

src/views/News/MCommerce.vue

@@ -170,6 +170,7 @@ export default {
         margin-top: 0;
         margin-bottom: 1rem;
         color: #414345;
+        word-break: break-all;
       }
       .down{
         border: 1px solid #E8DBC1;

src/views/News/PicNews.vue

@@ -26,7 +26,7 @@
               {{tmp.title}}
             </div>
           </li>
-          <li  style=" height: 0" v-for="(i,a) in 4" :key="'a'+a"></li>
+          <li  style=" height: 0;margin:0" v-for="(i,a) in 4" :key="'a'+a"></li>
         </ul>
         <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize"  @getLimit='initListFn' />
       </div>
@@ -117,12 +117,24 @@ export default {
 .picNews {
   @media screen and (min-width: 992px) {
     .picNews-ul {
-      justify-content: space-between;
+      justify-content: space-between!important;
     }
   }
   @media screen and (max-width: 992px) {
     .picNews-ul {
-      justify-content: space-around;
+      justify-content: space-around!important;
+    }
+  }
+  @media screen and (max-width: 1400px) and (min-width: 992px) {
+    .picNews-ul {
+      li{
+        width: 24%!important;
+      }
+    }
+  }
+    @media screen and (max-width: 992px) and (min-width: 768px) {
+    .picNews-ul {
+      justify-content: flex-start!important;
     }
   }
 }

src/views/News/Retail.vue

@@ -26,13 +26,13 @@
                 商品二维码推广工作组计划组织各地编码分支机构及有意愿、有条件的品牌商、生产商、零售商和系统服务商等相关企业共同参加。
               </p>
               <p>联系人：</p>
-              <p style="font-size: 12px">
-                李弘凯<i class="bi bi-telephone-fill"></i
-                >010-84295522<i class="bi bi-envelope-fill"></i>lihk@ancc.org.cn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                &nbsp;&nbsp;&nbsp;支俊凯<i class="bi bi-telephone-fill"></i>010-84295518<i
+              <p style="font-size: 12px" class="div2-name">
+                <span>李弘凯<i class="bi bi-telephone-fill"></i
+                >010-84295522<i class="bi bi-envelope-fill"></i>lihk@ancc.org.cn</span>
+                <span>支俊凯<i class="bi bi-telephone-fill"></i>010-84295518<i
                   class="bi bi-envelope-fill"
                 ></i
-                >zhijk@ancc.org.cn
+                >zhijk@ancc.org.cn</span>
               </p>
             </div>
           </div>
@@ -208,6 +208,7 @@ import VueSlickCarousel from "vue-slick-carousel";
 import "vue-slick-carousel/dist/vue-slick-carousel.css";
 import "vue-slick-carousel/dist/vue-slick-carousel-theme.css";
 import breadcrumb from "../comps/breadcrumb.vue";
+import { Form } from 'element-ui';
 
 
 export default {
@@ -295,11 +296,7 @@ export default {
     };
   },
   mounted() {
-    // 面包屑单独处理
-    this.$store.commit("system/SET_BREADCRUMB", [
-      { name: "应用领域", path: "/News/index" },
-      { name: "零售" },
-    ]);
+  
     this.getHomeLatestNews();
     this.getHomeGuideList();
     this.getQRCodeList();
@@ -307,6 +304,21 @@ export default {
     
 
   },
+  watch:{
+    $route: {
+      handler () {
+            // 面包屑单独处理
+        this.$store.commit("system/SET_BREADCRUMB", [
+          { name: "应用领域", path: "/News/index" },
+          { name: "零售" },
+        ]);
+      },
+      
+    }
+  },
+  created(){
+  
+  },
   methods: {
     // 初始化图片集
     initPicList(){
@@ -383,7 +395,7 @@ export default {
     async getQRCodeList() {
       const params = {
         page: "1",
-        size: '9',
+        size: '7',
       };
       const listRes = await this.$api.sell.getQRCodeList(params);
       const { returnCode, data } = listRes;
@@ -493,6 +505,9 @@ export default {
     font-size: 14px;
     color: #414345;
     line-height: 40px;
+     @media screen and (max-width: 992px) {
+    margin: 0 6px;
+  }
   }
   img {
     width: 100%;
@@ -507,6 +522,11 @@ export default {
     font-size: 14px;
     font-family: MicrosoftYaHei;
     color: #F05587;
+    @media screen and (max-width: 992px) {
+      flex-wrap: wrap;
+      padding: 0 6px;
+      padding-top: 20px;
+    }
     li{
       cursor: pointer;
       .list_icon{
@@ -559,12 +579,28 @@ export default {
       i {
         margin: 0 9px 0 20px;
       }
+      .div2-name{
+        padding-right: 5%;
+        display: flex;
+        justify-content: space-between;
+        @media screen and (max-width: 992px) {
+          flex-wrap: wrap;
+        }
+      }
     }
   }
 }
 
 .div4 {
   margin-bottom: 30px;
+  .row{
+    div:nth-child(2){
+      @media screen and (max-width: 992px) {
+         margin-top: 30px;
+        }
+      
+    }
+  }
   .list-style {
     min-height: 100%;
     background: #fff;
@@ -662,10 +698,10 @@ export default {
   }
 
   .banner {
-    height: 420px;
+    height: 320px;
     .banner-item {
       width: 100%;
-      height: 420px;
+      height: 320px;
       position: relative;
       
       .banner-bg {
@@ -680,6 +716,11 @@ export default {
           margin-top: -30px;
           color: #fff;
           font-size: 12px;
+          white-space: nowrap;
+          text-overflow:ellipsis;
+          overflow:hidden; 
+          width: 90%;
+          margin-left: 5%;
         }
       }
     }
@@ -743,7 +784,7 @@ export default {
     bottom: 0;
   }
   img{
-      height: 411px;
+      height: 311px;
       background: url('../../assets/image/news/ls4.png') 100% 100%;
     }
 }

src/views/News/index.vue

@@ -626,6 +626,11 @@ export default {
     .tpzx-ul {
       justify-content: space-around;
     }
+    .four-ul {
+      li {
+        width: 100%;
+      }
+    }
   }
 }
 </style>

src/views/News/msg.vue

@@ -346,6 +346,7 @@ export default {
   }
   .msg-text {
     p{
+      word-break: break-all;
       img{
         margin-left: -28px;
         max-width: 100%;

src/views/Org/Sites.vue

@@ -115,7 +115,7 @@
           </p>
         </div>
         <div class="nsjg">
-          <Title :father="site.title11"></Title>
+          <Title :father="site.title11"  ref="1-11"></Title>
           <p>
             全球产品电子代码中国管理中心（EPCglobal
             China）作为EPCglobal在中国大陆地区的唯一组织成员，负责中国范围内产品电子代码的注册、管理和标准化工作，推广EPC系统，提供技术支持和培训产品电子代码系统用户。EPCglobal

src/views/Org/comps/table.vue

 <template>
   <div class="fqtable">
     <div class="row fqthead">
-      <div class="col-lg-2">序号</div>
-      <div class="col-lg-3">文件编号</div>
-      <div class="col-lg-5">文件名称</div>
-      <div class="col-lg-2">列编时间</div>
+      <div class="" style="width:10%;text-align:center">序号</div>
+      <div class="" style="width:37.5%;text-align:center">文件编号</div>
+      <div class="" style="width:37.5%;text-align:center">文件名称</div>
+      <div class="" style="width:15%;text-align:center">列编时间</div>
     </div>
     <div class="fqtbody">
-      <div class="row" v-for="(tmp, i) in list" :key="i">
-        <div class="col-lg-2">{{ i + 1 }}</div>
-        <div class="col-lg-3">{{tmp.number}}</div>
-        <div class="col-lg-5">{{tmp.name}}</div>
-        <div class="col-lg-2">{{tmp.time}}</div>
+      <div class="row fqthead" v-for="(tmp, i) in list" :key="i">
+        <div class=""  style="width:10%;text-align:center">{{ i + 1 }}</div>
+        <div class="" style="width:37.5%;text-align:center">{{tmp.number}}</div>
+        <div class="" style="width:37.5%;text-align:center">{{tmp.name}}</div>
+        <div class="" style="width:15%;text-align:center">{{tmp.time}}</div>
       </div>
     </div>
   </div>
@@ -28,6 +28,7 @@ export default {
     border-radius: 4px;
     display: flex;
     align-items: center;
+    justify-content: space-between;
     margin: 0;
     padding: 10px 0;
     border-bottom: 1px solid #e9e9e9;
@@ -52,6 +53,11 @@ export default {
       &:nth-child(odd) {
         background: rgba(242, 99, 53, 0.04);
       }
+      div{
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
 }

src/views/Search/check.vue

@@ -9,6 +9,7 @@
                 v-model="search.pack"
                 class="w160"
                 @input="handlePackChange"
+                oninput="value=value.replace(/[^\d.]/g,'')"
             ></el-input>
             <span>（备注：单品为0）</span>
           </el-form-item>
@@ -17,6 +18,7 @@
             <el-input
                 v-model="search.code"
                 class="w160"
+                maxlength="12"
                 @input="handleCodeChange"
             ></el-input>
           </el-form-item>
@@ -64,6 +66,17 @@ export default {
       result: null,
     };
   },
+  watch:{
+    'search.code': {
+        handler(newVal, oldVal) {
+            if(newVal.length==0){
+              this.search.result=''
+            }
+        },
+        deep: true,
+        immediate: true
+    }
+  },
   methods: {
     handleCodeChange() {
       if (this.search.code.length === 13) {

src/views/Search/gln.vue

@@ -125,9 +125,14 @@ export default {
       });
     },
     hasSpecialString(string){
-      const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
+      // const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
+      // if(!regName.test(string)){
+      //   this.$message.error('查询值只能包含中英文字符和数字！');
+      //   return true;
+      // }
+      const regName =/^[0-9]*[1-9][0-9]*$/;
       if(!regName.test(string)){
-        this.$message.error('查询值只能包含中英文字符和数字！');
+        this.$message.error('查询值只能数字！');
         return true;
       }
       return false
@@ -139,7 +144,7 @@ export default {
       }
       this.showResult = true;
       const params = {...this.search};
-      const searchGlnRes = await this.$api.search.searchGln(params);
+      const searchGlnRes = await this.$api.search.searchCodeGln(params);
       const {returnCode, data} = searchGlnRes;
       console.log(searchGlnRes)
       console.log(data)

src/views/Search/tools.vue

@@ -55,8 +55,30 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+@media screen and (max-width: 1200px) and (min-width: 992px) {
+    .tool-card {
+        width: 23%!important;
+    }
+}
+@media screen and (max-width: 992px) {
+  .search-tools_s 
+  {
+    .tools-wrapper{
+      justify-content: center!important;
+      .tool-card {
+        width: 100%;
+        height: auto;
+        .tool-img {
+          height: auto;
+        }
+      }
+    }
+  }
+}
+</style>
+<style lang="scss" >
 
-<style lang="scss">
 .search-tools_s {
   min-height: 100%;
 
@@ -68,10 +90,11 @@ export default {
     line-height: 25px;
     margin-bottom: 30px;
   }
-
   .tools-wrapper {
     min-height: 100%;
-
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
     .tool-card {
       cursor: pointer;
       width: 194px;
@@ -80,7 +103,7 @@ export default {
       border-radius: 4px;
       border: 1px solid rgba(197, 216, 238, 0.5);
       float: left;
-      margin-right: 30px;
+      // margin-right: 30px;
       margin-bottom: 30px;
       transition-duration: 0.2s;
       transition-timing-function: ease;

src/views/Sell/pictureList.vue

@@ -14,7 +14,7 @@
                 {{tmp.title}}
               </div>
             </li>
-            <li  style=" height: 0" v-for="(i,a) in 4" :key="'a'+a"></li>
+            <li  style=" height: 0;margin:0" v-for="(i,a) in 4" :key="'a'+a"></li>
           </ul>
           <pages :total="tableResult.totalCount" :currPage="tableResult.currPage" :pageSize="tableResult.pageSize"  @getLimit='initListFn' />
         </div>
@@ -103,7 +103,7 @@ export default {
   }
   @media screen and (max-width: 992px) {
     .picNews-ul {
-      justify-content: space-around;
+      justify-content: space-around!important;
     }
   }
 }

src/views/Service/Partners/caseList.vue

@@ -32,6 +32,7 @@
         <li v-for="(tmp, i) in list" :key="i" @click="handelJumpMsg(tmp)">
           <a> {{ tmp.title }}</a>
         </li>
+        <p v-if="list.length==0"> 没有可显示的内容！</p>
       </ul>
       <pages
           :currPage="pageParams.currPage"

src/views/Service/Partners/caseMsg.vue

@@ -106,6 +106,15 @@ export default {
     img {
       max-width: 95%;
     }
+    ul{
+      display: inline-block;
+      // width: 90%;
+      // margin-left: 10%;
+      padding-left: 50px;
+      p{
+        // text-indent: 0;
+      }
+    }
   }
 }
 </style>

src/views/Service/book.vue

@@ -158,7 +158,8 @@ export default {
     },
 
     async getBooks(page = 1) {
-      const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize,id:Number(this.id)})
+      
+      const res = await this.$api.service.getCodeBook({page: page, size: this.page.pageSize,id:this.id})
       const {returnCode, data} = res;
       if (returnCode === "0") {
         this.bookList = data.list

src/views/User/index.vue

@@ -3,11 +3,13 @@
   <div class="gs-entry">
     <div class="header">
       <div class="content">
-        <img @click="$router.push({path:'/'})" src="./img/logo.png" alt="">
+        <!-- <img @click="$router.push({path:'/'})" src="./img/logo.png" alt=""> -->
       </div>
     </div>
     <div class="body">
+       
       <div class="content">
+        <img @click="$router.push({path:'/'})" src="./img/logo.png" alt="" class="logoCss">
         <component v-bind:is="component"></component>
       </div>
       <div class="bottom">
@@ -69,7 +71,7 @@ export default {
 
   .header {
     display: flex;
-    flex: 0 0 112px;
+    flex: 0 0 100px;
     justify-content: center;
     //padding-top: 58px;
     width: 100%;
@@ -86,11 +88,21 @@ export default {
     max-width: 1500px;
     display: flex;
     flex-direction: column;
-
+    
+   
     .content {
       flex: 1 1 auto;
-      padding-top: 148px;
+      padding-top: 108px;
       text-align: center;
+    background: #fff;
+    position: relative;
+     .logoCss{
+        width: 93px;
+        height: 58px;
+        position:absolute;
+        top: 50px;
+        left: 50px;
+      }
     }
 
     .bottom {
@@ -150,7 +162,7 @@ export default {
 
     .body {
       .content {
-        padding-top: 30px;
+        // padding-top: 30px;
       }
     }
   }

src/views/comps/pages.vue

@@ -21,6 +21,7 @@
         :page-size="pageSize"
         :current-page="currPage"
         layout="prev, pager, next"
+        :pager-count="5"
         :total="total"
         @current-change="goPage"
         background

src/views/comps/pages2.vue

@@ -21,6 +21,7 @@
         :page-size="pageSize"
         :current-page="currPage"
         layout="prev, pager, next"
+        :pager-count="5"
         :total="total"
         @size-change="changeSize"
          @current-change="goPage"