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

src/axios/module/search.js

@@ -21,7 +21,7 @@ const searchInternal = (params = {}) => {
 
 // 条码查询-境内码商品信息
 const searchInternalProduct = (params = {}) => {
-	return POST(`${Prefix}/office/production/api/search`, params)
+	return POST(`${Prefix}/office/codeSearch/api/domesticCodeProductionNews`, params)
 }
 
 // 条码查询—查询商品变更记录

src/components/layout/header/service.js

@@ -73,7 +73,7 @@ export default  {
                     id: uuid("gs_nav"),
                     name: "UDI一站式服务",
                     index: 4,
-                    link: "http://healthcare.ancc.org.cn/webhug/UDI/page1.html",
+                    link: "https://v4.gds.org.cn/#/udi/anccOpen",
 
                 },
             ],

src/main.js

@@ -5,10 +5,8 @@ import router from "./router/index";
 import store from "./vuex/store";
 import $ from "jquery";
 import "./assets/css/_reset.css";
-// import "bootstrap/dist/css/bootstrap.min.css";
 // import "./assets/css/main.scss";
 import "./assets/css/layout.scss";
-// import "bootstrap/dist/js/bootstrap.min.js";
 import "./plugins/element.js";
 import "./plugins/qrcode.js";
 import ElementUI from 'element-ui'

src/views/Home/index.vue

@@ -330,18 +330,7 @@
               <div class="chaxun">
                 <div class="chaxun-kj">
                   <div class="row">
-                    <div class="col-lg-2 chaxun-left">
-                      <el-select v-model="chaxun.type2" placeholder="请选择">
-                        <el-option
-                            v-for="(item, i) in chaxun.options2"
-                            :key="i"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
-                    </div>
-                    <div class="col-lg-7 chaxun-middle">
+                    <div class="col-lg-9 chaxun-middle">
                       <el-input
                           placeholder="请输入13位或14位的商品条码"
                           v-model="chaxun.keywords"
@@ -1415,18 +1404,10 @@ export default {
       left: 0;
 
       &::before {
-        background: url("../../assets/image/home/prevArrow-hover.png") no-repeat;
+        // background: url("../../assets/image/home/prevArrow-hover.png") no-repeat;
         background-size: 100% 100%;
         content: "";
       }
-
-      // &:hover {
-      //   &::before {
-      //     background: url("../../assets/image/home/prevArrow-hover.png")
-      //       no-repeat;
-      //     background-size: 100% 100%;
-      //   }
-      // }
     }
 
     &.slick-next {
@@ -1435,18 +1416,11 @@ export default {
       justify-content: flex-end;
 
       &::before {
-        background: url("../../assets/image/home/nextArrow-hover.png") no-repeat;
+        // background: url("../../assets/image/home/nextArrow-hover.png") no-repeat;
         background-size: 100% 100%;
         content: "";
       }
 
-      // &:hover {
-      //   &::before {
-      //     background: url("../../assets/image/home/nextArrow-hover.png")
-      //       no-repeat;
-      //     background-size: 100% 100%;
-      //   }
-      // }
     }
 
     img {
@@ -1466,6 +1440,7 @@ export default {
         &::before {
           width: 10px;
           height: 18px;
+          background: url("../../assets/image/home/prevArrow-hover.png") no-repeat;
         }
       }
 
@@ -1477,6 +1452,7 @@ export default {
         &::before {
           width: 10px;
           height: 18px;
+          background: url("../../assets/image/home/nextArrow-hover.png") no-repeat;
         }
       }
     }
@@ -1513,32 +1489,40 @@ export default {
   }
 
   .newsBanner {
+
     .slick-arrow {
       width: 40px;
       height: 50px;
       margin: 0 10px;
-
-      &.slick-prev {
       position: relative;
-
+      &.slick-prev {
+        width: 40px;
+        height: 50px;
         &::before {
           width: 9px;
           height: 14px;
-          //   background: url("../../assets/image/home/prevArrow-hover.png")
-          //   no-repeat;
-          // background-size: 100% 100%;
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+            background: url("../../assets/image/home/prevArrow-hover.png")
+            no-repeat;
         }
       }
 
       &.slick-next {
-        position: relative;
-
+        width: 40px;
+        height: 50px;
+        // bottom: 0;
         &::before {
           width: 9px;
           height: 14px;
-          //   background: url("../../assets/image/home/nextArrow-hover.png")
-          //   no-repeat;
-          // background-size: 100% 100%;
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+            background: url("../../assets/image/home/nextArrow-hover.png")
+            no-repeat;
         }
       }
 
@@ -1949,7 +1933,6 @@ export default {
         width: 100%;
         text-align: center;
         line-height: 50px;
-
         @include ellipsis;
         a {
           color: rgba(255, 255, 255, 1);

src/views/Search/check.vue

@@ -42,7 +42,7 @@
         <p>
           1.请根据下列提示，输入商品的包装指示符和商品条码，系统会自动计算出它的校验码。欲了解校验码的计算规则，请点击
           <a
-              href="/Knowledge"
+              href="/Knowledge/GS1System/goodsGln"
               target="_blank"
               style="color: #5ac8fa"
           >了解更多 >></a

src/views/Search/gln.vue

@@ -47,8 +47,8 @@
                 <template slot="empty">
                   <span style="color: #969799;">未查到该信息</span>
                 </template>
-                <el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GLN" width="180"></el-table-column>
-                <el-table-column prop="address.name" label="企业名称（含英文）" width="180">
+                <el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GLN" width="160"></el-table-column>
+                <el-table-column prop="address.name" label="企业名称（含英文）" width="220">
                 </el-table-column>
                 <el-table-column prop="address.streetAddressOne" label="中文地址"></el-table-column>
                 <el-table-column prop="status" label="英文地址"></el-table-column>

src/views/Search/internal.vue

@@ -106,9 +106,9 @@
                 header-cell-class-name="search-table-hc"
                 style="width: 100%"
             >
-              <el-table-column prop="_source.code" label="厂商识别代码" width="180">
+              <el-table-column prop="_source.code" label="厂商识别代码" width="150">
               </el-table-column>
-              <el-table-column prop="_source.firm_name" label="厂商名称" width="180">
+              <el-table-column prop="_source.firm_name" label="厂商名称" width="220">
               </el-table-column>
               <el-table-column label="状态">
                 <template slot-scope="scope">
@@ -183,14 +183,14 @@
         <img src="./img/pic_ex_jl.png" align="right" alt=""/>
         <p>
           1、<a
-            href="/Knowledge/article?id=144"
+            href="/Knowledge/GS1System/goodsGln"
             target="_blank"
             style="color: #5ac8fa"
         >商品条码</a
         >
           （又称全球贸易项目代码GTIN）是指包含厂商识别代码在内的对零售商品、非零售商品、物流单元、位置、资产及服务进行全球惟一标识的一种代码（或称数据结构）。对贸易项目进行编码和符号表示（前缀码为690-699是境内条码），能够实现商品零售（POS）、进货、存货管理、自动补货、销售分析及其它业务运作的自动化。
           <a
-              href="/Knowledge"
+              href="/Knowledge/GS1System/goodsGln"
               target="_blank"
               style="color: #5ac8fa"
           >了解更多 >></a
@@ -365,11 +365,12 @@ export default {
         this.detailDialogVisible = true
       }
     },
+
     // 查看变更详情
     async handleCheckChange(row) {
       console.log(row);
       const searchGlnRes = await this.$api.search.searchCompanyChange({code: row.code});
-      console.log(searchGlnRes)
+      console.log(searchGlnRes);
       const {data} = searchGlnRes;
       if (searchGlnRes.success) {
         console.log(data)
@@ -383,6 +384,7 @@ export default {
         alert(searchGlnRes.returnMsg || '网络错误，请稍后再试')
       }
     },
+
     async handleSearchCompany() {
       this.showResult = true;
       this.resultType = 'company'
@@ -412,13 +414,36 @@ export default {
     },
 
     async handleSearchProduct() {
+      if (!this.isVerificationPass) {
+        return this.$message.error('请先进行验证');
+      }
+      if (!this.productSearch.code) {
+        return this.$message.error('请输入商品条码');
+      }
+      this.showResult = true;
+      this.resultType = 'product';
+      const params = {code: this.productSearch.code};
+      const searchGlnRes = await this.$api.search.searchInternalProduct(params);
+      if (searchGlnRes.returnCode === "0") {
         const a = document.createElement('a')
-      a.setAttribute('href', `/internal_code_search/searchResult2.aspx?keyword=${this.productSearch.code}`)
+        a.setAttribute('href', searchGlnRes.data)
         // a.setAttribute('target', '_blank')
         a.setAttribute('id', 'cow-link-temp')
         document.body.appendChild(a)
         a.click()
-      document.body.removeChild(document.getElementById('cow-link-temp'))
+      } else {
+        this.errorMsg =
+            searchGlnRes.returnMsg ||
+            "没有符合条件的记录！";
+        this.result = null;
+      }
+      // const a = document.createElement('a')
+      // a.setAttribute('href', `/internal_code_search/searchResult2.aspx?keyword=${this.productSearch.code}`)
+      // // a.setAttribute('target', '_blank')
+      // a.setAttribute('id', 'cow-link-temp')
+      // document.body.appendChild(a)
+      // a.click()
+      // document.body.removeChild(document.getElementById('cow-link-temp'))
       // window.open(`http://search.anccnet.com/searchResult2.aspx?keyword=${this.productSearch.code}`, '_blank')
     }
 

src/views/Search/tools.vue

@@ -16,13 +16,13 @@
         </div>
       </div>
 
-      <div class="tool-card" @click="window.open('http://www.chinatrace.org/')">
+      <div class="tool-card">
         <div class="tool-img">
           <img src="./img/pic_tiaomashuisu.png" alt="" />
         </div>
         <div class="tool-name y-center zs-card">
-          <div><img src="./img/icon_android.png" alt="" />Android</div>
-          <div><img src="./img/icon_iphone.png" alt="" />Iphone</div>
+          <div><a style="color: #0d2c6c" href="http://www.chinatrace.org/toAndroidDownload.html" target="_blank"><img src="./img/icon_android.png" alt="" />Android</a></div>
+          <div><a style="color: #0d2c6c" href="http://www.chinatrace.org/toIphoneDownload.html" target="_blank"><img src="./img/icon_iphone.png" alt="" />Iphone</a></div>
         </div>
       </div>
     </div>

src/views/User/index.vue

@@ -12,7 +12,16 @@
       </div>
       <div class="bottom">
         <span>版权所有：中国物品编码中心</span>
-        <span>京ICP备11036137号-10 | 京公网安备11010102001434号</span>
+        <div><a class="gs-hover" href="https://beian.miit.gov.cn/" target="_blank"
+        >京ICP备11036137号-10</a
+        > | <a class="gs-hover"
+               href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010102005499"
+        >
+          <img
+              src="../../assets/image/foot/beian.png"
+              alt=""
+          />京公网安备11010102005499号</a
+        ></div>
         <span>地址：北京市东城区安定门外大街138号皇城国际大厦B座3-6层 | 邮编：100011</span>
       </div>
     </div>
@@ -95,9 +104,16 @@ export default {
       margin-top: 40px;
 
 
-      span {
+      > span, > div {
         margin: 0 10px;
       }
+
+      >div > a{
+        color: white;
+        img{
+          margin-right: 4px;
+        }
+      }
     }
   }
 
@@ -121,7 +137,7 @@ export default {
 @media (max-width: 767px) {
   //<=768的设备
   .gs-entry {
-    .header{
+    .header {
       flex: 0 0 60px;
       //padding-top: 20px;
       padding-bottom: 10px;
@@ -130,6 +146,7 @@ export default {
         padding-left: 6%;
       }
     }
+
     .body {
       .content {
         padding-top: 30px;