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

src/assets/css/_reset.css

@@ -99,7 +99,7 @@ input[type="button"],
 input[type="submit"] {
   cursor: pointer;
 }
-::-webkit-scrollbar-track-piece {
+/* ::-webkit-scrollbar-track-piece {
   background: #fff1d9;
   border-radius: 2px;
 }
@@ -114,7 +114,7 @@ input[type="submit"] {
 }
 ::-webkit-scrollbar-thumb:hover {
   background-color: #e59f29;
-}
+} */
 
 select {
   appearance: none;

src/axios/module/home.js

@@ -34,12 +34,12 @@ const homeSmallImages = (params = {}) => {
 
 // 获取定制服务
 const customService = (params = {}) => {
-	return POST(`${Prefix}/office/userfunctionbinding/api/find`, params)
+	return POST(`${Prefix}/office/userfunctionbinding/authApi/find`, params)
 }
 
 // 更新定制服务
 const updateCustomService = (params = {}) => {
-	return POSTFORM(`${Prefix}/office/userfunctionbinding/api/update`, params)
+	return POSTFORM(`${Prefix}/office/userfunctionbinding/authApi/update`, params)
 }
 
 

src/config/constant.js

@@ -4,7 +4,7 @@ export const QUERY_PAGE_SIZE_10 = 10
 export const QUERY_PAGE_SIZE_20 = 20
 export const QUERY_PAGE_SIZE_All = 999999
 // export const FILE_PREFIX = "http://81.68.189.225:9091/office/uploadFileResource"
-export const FILE_PREFIX = `${window.location.origin}/office/uploadFileResource`
+export const FILE_PREFIX = `${window.location.protocol}//${window.location.hostname}:9091/office/uploadFileResource`
 export const FILE_PREFIX1 = "http://www.gov.cn"
 export const FILE_PREFIX2 = "http://ltfzs.mofcom.gov.cn"
 export const FILE_PREFIX3 = "https://xxgk.mot.gov.cn"

src/views/Business/copms/tmgg.vue

@@ -4,7 +4,7 @@
     <div class="container">
       <ul class="tmgg-ul">
         <li v-for="(tmp, i) in list" :key="i" @click="openMsg(tmp)">
-          <span>【{{ tmp.logoutFlag === '0' ? '注销' : '注册' }}】</span>
+          <span>【{{ tmp.logoutFlag === '0' ? '注册' : '注销' }}】</span>
           <span>{{ tmp.firmName }}</span>
         </li>
       </ul>
@@ -52,9 +52,9 @@ export default {
       console.log(tmp, 'openMsg');
       let type;
       if (tmp.logoutFlag === "0") {
-        type = "zhuxiao";
-      } else {
         type = "zhuce";
+      } else {
+        type = "zhuxiao";
       }
       let routeData = this.$router.resolve({
         path: "/Business/Notice/Msg",

src/views/Home/comps/list.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="row">
       <div class="col">
-        <div @click="handelMore" class="more float-end">
+        <div @click="handelMore" class="more">
           <span>了解更多</span
           ><img src="../../../assets/image/home/more-arrow.png" alt="" />
         </div>
@@ -46,7 +46,7 @@ export default {
   .row {
     display: flex;
     justify-content: space-between;
-    padding: 11px 0;
+    padding: 11.5px 0;
     margin: 0;
     cursor: pointer;
     .list-left {
@@ -70,12 +70,16 @@ export default {
           @include ellipsis;
         }
       }
+      
     }
     .list-right {
       text-align: right;
       color: #999999;
       font-size: 16px;
     }
+    &:last-child{
+        padding-bottom: 0;
+      }
   }
   .more {
     width: 120px;
@@ -86,6 +90,7 @@ export default {
     background: #cd3c0d;
     border-radius: 4px;
     position: relative;
+    float: right;
     &:hover {
       background: #a82c05;
       img {

src/views/Home/index.vue

@@ -106,7 +106,7 @@
                 </button>
               </li>
             </ul>
-            <div class="tab-content marginTop10">
+            <div class="tab-content marginTop15">
               <div
                 class="tab-pane fade show active"
               >
@@ -1794,6 +1794,10 @@ export default {
     padding: 18px 0;
   }
 
+  .marginTop15{
+    margin-top: 15px;
+  }
+
   .marginTop10 {
     margin-top: 10px;
   }

src/views/Knowledge/Statuteinfo.vue

@@ -60,9 +60,6 @@ export default {
 @media screen and (max-width: 992px) {
 }
 .showHtml {
-  p {
-    overflow: hidden;
-  }
   img {
     max-width: 100%;
   }

src/views/Knowledge/article.vue

@@ -70,9 +70,6 @@ export default {
 @media screen and (max-width: 992px) {
 }
 .showHtml {
-  p {
-    overflow: hidden;
-  }
   img {
     max-width: 100%;
   }

src/views/News/HealthDetail.vue

@@ -46,9 +46,6 @@ export default {
 </script>
 <style lang="scss">
 .health-detail {
-  p {
-    overflow: hidden;
-  }
   img {
     max-width: 100%;
   }

src/views/News/NoticeArticle.vue

@@ -73,9 +73,6 @@ export default {
 @media screen and (max-width: 992px) {
 }
 .showHtml {
-  p {
-    overflow: hidden;
-  }
   img {
     max-width: 100%;
   }

src/views/News/msg.vue

@@ -269,9 +269,6 @@ export default {
     }
   }
   .msg-text {
-    p{
-      overflow: hidden;
-    }
     img{
       max-width: 100%;
     }

src/views/News/msgVideo.vue

@@ -268,9 +268,6 @@ export default {
     }
   }
   .msg-text {
-    p {
-      overflow: hidden;
-    }
     img {
       max-width: 100%;
     }

src/views/Search/bike.vue

@@ -112,6 +112,9 @@ export default {
         params.firmName = this.search.code
       }
       this.searchCodeShow = this.search.code;
+      if(this.hasSpecialString(this.searchCodeShow)){
+        return true
+      }
       this.showResult = true;
       const searchGlnRes = await this.$api.search.searchBike(params);
       const {returnCode, data} = searchGlnRes;

src/views/Search/external.vue

@@ -108,6 +108,9 @@ export default {
     },
     async handleSearch() {
       this.searchCodeShow = this.search.code;
+      if(this.hasSpecialString(this.searchCodeShow)){
+        return true
+      }
       this.showResult = true;
       const params = {
         "code": this.search.code,

src/views/Search/gln.vue

@@ -124,8 +124,19 @@ export default {
         this.captchaPath = window.URL.createObjectURL(res.body);
       });
     },
+    hasSpecialString(string){
+      const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
+      if(!regName.test(string)){
+        this.$message.error('查询值只能包含中英文字符和数字！');
+        return true;
+      }
+      return true
+    },
     async handleSearch() {
       this.searchCodeShow = this.search.code;
+      if(this.hasSpecialString(this.searchCodeShow)){
+        return true
+      }
       this.showResult = true;
       const params = {...this.search};
       const searchGlnRes = await this.$api.search.searchGln(params);

src/views/Search/glossary.vue

@@ -100,6 +100,9 @@ export default {
         captcha: this.captcha,
       };
       this.searchCodeShow = this.search.code;
+      if(this.hasSpecialString(this.searchCodeShow)){
+        return true
+      }
       this.showResult = true;
       const searchGlnRes = await this.$api.search.searchGlossary(params);
       const {returnCode, data} = searchGlnRes;

src/views/Search/index.vue

@@ -5,7 +5,7 @@
       <div class="col-lg-3">
         <SubNav/>
       </div>
-      <div class="col-lg-9">
+      <div class="col-lg-9 gs-search-section">
         <router-view></router-view>
       </div>
     </div>
@@ -32,4 +32,21 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+@media screen and (max-width: 992px) {
+  .el-form-item{
+    display: flex;
+    flex-direction: column;
+  }
+  .el-form-item .el-form-item__label {
+    width: 100% !important;
+  }
+  .el-form-item .el-form-item__content {
+    margin-left: 0 !important;
+  }
+}
+
+.gs-search-section {
+
+}
+</style>

src/views/Search/internal.vue

@@ -387,8 +387,6 @@ export default {
     },
 
     async handleSearchCompany() {
-      this.showResult = true;
-      this.resultType = 'company'
       if (this.company === CODE) {
         this.searchCodeShow = this.companySearch.code;
       } else if (this.company === NAME) {
@@ -396,6 +394,11 @@ export default {
       } else {
         this.searchCodeShow = this.companySearch.address;
       }
+      if(this.hasSpecialString(this.searchCodeShow)){
+        return true
+      }
+      this.showResult = true;
+      this.resultType = 'company'
       const params = {type: this.company, uuid: this.uuid, code: this.searchCodeShow, captcha: this.captcha,};
       const searchGlnRes = await this.$api.search.searchInternal(params);
       const {returnCode, data} = searchGlnRes;
@@ -422,6 +425,9 @@ export default {
       if (!this.productSearch.code) {
         return this.$message.error('请输入商品条码');
       }
+      if(this.hasSpecialString(this.productSearch.code)){
+        return true
+      }
       this.showResult = true;
       this.resultType = 'product';
       const params = {code: this.productSearch.code};

src/views/Search/shortcode.vue

@@ -129,8 +129,6 @@ export default {
   },
   methods: {
     async handleSearchCompany() {
-      this.showResult = true;
-
       const params = {
         shortCode: "",
         firmName: "",
@@ -140,13 +138,22 @@ export default {
       };
       if (this.company === CODE) {
         params.shortCode = this.companySearch.code;
+        if(this.hasSpecialString(this.companySearch.code)){
+          return true
+        }
       } else if (this.company === NAME) {
         params.firmName = this.companySearch.name;
+        if(this.hasSpecialString(this.companySearch.name)){
+          return true
+        }
       } else {
         params.registerAddress = this.companySearch.address;
+        if(this.hasSpecialString(this.companySearch.address)){
+          return true
+        }
       }
+      this.showResult = true;
       const searchGlnRes = await this.$api.search.searchGetList(params);
-      console.log(searchGlnRes)
       const {returnCode, data} = searchGlnRes;
       if (returnCode === "0") {
         // this.result = data;

src/views/Search/validation.js

@@ -21,5 +21,13 @@ export default {
                 this.captchaPath = window.URL.createObjectURL(res.body);
             });
         },
+        hasSpecialString(string){
+            const regName =/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
+            if(!regName.test(string)){
+                this.$message.error('查询值只能包含中英文字符和数字！');
+                return true;
+            }
+            return true
+        }
     },
 }