修改bootStrap5为bootStrap4

package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@popperjs/core": "^2.10.1",
     "@tweenjs/tween.js": "^18.5.0",
-    "bootstrap": "^5.1.0",
+    "bootstrap": "^4.6",
     "clear": "^0.1.0",
     "core-js": "^2.6.11",
     "echarts": "^4.7.0",

public/index.html

@@ -6,11 +6,12 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="referrer" content="never">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link href='https://cdn.bootcss.com/social-share.js/1.0.16/css/share.min.css' rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_3100457_m1ptblb5k5c.css">
-    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js" ></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js" ></script>
+    <link href='https://cdn.bootcss.com/social-share.js/1.0.16/css/share.min.css' rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" ></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" ></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" ></script>
 		<!-- <link rel="shortcut icon" href="/favicon.ico"/> -->
     <title>中国物品编码中心</title>
   </head>

public/tinymce/skins/ui/oxide/skin.css

@@ -593,7 +593,7 @@ button::-moz-focus-inner {
 .tox .tox-collection__item-label {
   color: currentColor;
   display: inline-block;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   font-size: 14px;
   font-style: normal;
@@ -1147,7 +1147,7 @@ button::-moz-focus-inner {
 .tox .tox-dialog__body {
   color: #222f3e;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   font-size: 16px;
   font-style: normal;
@@ -1196,7 +1196,7 @@ button::-moz-focus-inner {
 .tox .tox-dialog__body-content {
   box-sizing: border-box;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   flex-direction: column;
   -ms-flex-preferred-size: auto;
   max-height: 650px;
@@ -1339,17 +1339,17 @@ button::-moz-focus-inner {
 }
 .tox .tox-dialog__body-iframe {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   flex-direction: column;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-dialog__body-iframe .tox-navobj {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-dialog__body-iframe .tox-navobj :nth-child(2) {
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   height: 100%;
 }
@@ -1409,7 +1409,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-dropzone-container {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-dropzone {
@@ -1430,7 +1430,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-edit-area {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   overflow: hidden;
   position: relative;
@@ -1439,7 +1439,7 @@ body.tox-dialog__disable-scroll {
   background-color: #fff;
   border: 0;
   box-sizing: border-box;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   height: 100%;
   position: absolute;
@@ -1483,7 +1483,7 @@ body.tox-dialog__disable-scroll {
   transition-delay: 0s;
 }
 .tox .tox-control-wrap {
-  flex: 1;
+  flex-grow: 1;
   position: relative;
 }
 .tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,
@@ -1604,7 +1604,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-form {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   flex-direction: column;
   -ms-flex-preferred-size: auto;
 }
@@ -1613,7 +1613,7 @@ body.tox-dialog__disable-scroll {
   margin-bottom: 4px;
 }
 .tox .tox-form-group--maximize {
-  flex: 1;
+  flex-grow: 1;
 }
 .tox .tox-form__group--error {
   color: #c00;
@@ -1646,21 +1646,21 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-form__group--stretched {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   flex-direction: column;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-form__group--stretched .tox-textarea {
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-form__group--stretched .tox-navobj {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-form__group--stretched .tox-navobj :nth-child(2) {
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   height: 100%;
 }
@@ -1827,7 +1827,7 @@ body.tox-dialog__disable-scroll {
   background: url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==);
 }
 .tox .tox-image-tools__toolbar > .tox-spacer {
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-croprect-block {
@@ -2356,7 +2356,7 @@ body.tox-dialog__disable-scroll {
 .tox .tox-slider {
   align-items: center;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
   height: 24px;
   justify-content: center;
@@ -2848,7 +2848,7 @@ body.tox-dialog__disable-scroll {
   border: 1px solid #cccccc;
   border-radius: 3px;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   position: relative;
 }
 /* stylelint-disable */
@@ -2868,12 +2868,12 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-dialog__content-js {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-dialog__body-content .tox-collection {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   -ms-flex-preferred-size: auto;
 }
 .tox .tox-image-tools-edit-panel {

public/tinymce/skins/ui/oxide/skin.mobile.css

@@ -229,7 +229,7 @@
   background-color: #fff;
   border-bottom: 1px solid #cccccc;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   height: 2.5em;
   width: 100%;
   /* Make it no larger than the toolstrip, so that it needs to scroll */
@@ -244,7 +244,7 @@
   align-items: center;
   display: flex;
   height: 100%;
-  flex: 1;
+  flex-grow: 1;
 }
 .tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container {
   background: #f44336;
@@ -279,7 +279,7 @@
   align-items: center;
   display: flex;
   height: 100%;
-  flex: 1;
+  flex-grow: 1;
   padding-bottom: 0.4em;
   padding-top: 0.4em;
   /* Make any buttons appearing on the left and right display in the centre (e.g. color edges) */
@@ -371,7 +371,7 @@
 }
 .tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider {
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   margin-left: 0;
   margin-right: 0;
   padding: 0.28em 0;
@@ -386,7 +386,7 @@
 .tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line {
   background: #cccccc;
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   height: 0.2em;
   margin-bottom: 0.3em;
   margin-top: 0.3em;
@@ -404,7 +404,7 @@
 .tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient {
   background: linear-gradient(to right, hsl(0, 100%, 50%) 0%, hsl(60, 100%, 50%) 17%, hsl(120, 100%, 50%) 33%, hsl(180, 100%, 50%) 50%, hsl(240, 100%, 50%) 67%, hsl(300, 100%, 50%) 83%, hsl(0, 100%, 50%) 100%);
   display: flex;
-  flex: 1;
+  flex-grow: 1;
   height: 0.2em;
   margin-bottom: 0.3em;
   margin-top: 0.3em;
@@ -456,7 +456,7 @@
   align-items: center;
   display: flex;
   height: 100%;
-  flex: 1;
+  flex-grow: 1;
 }
 .tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper {
   flex-direction: column;

src/assets/css/_base.scss

@@ -3,6 +3,29 @@ body {
   font-family: $yahei;
 }
 
+@media (min-width: 1400px) {
+  .container {
+    max-width: 1320px;
+  }
+  .container-sm {
+    max-width: 1320px;
+  }
+  .container-md {
+    max-width: 1320px;
+  }
+  .container-lg {
+    max-width: 1320px;
+  }
+  .container-xl {
+    max-width: 1320px;
+  }
+  .container-xxl {
+    max-width: 1320px;
+  }
+  .container-fluid {
+    max-width: 100%;
+  }
+}
 // 查询表单
 .content-query {
   .el-form {

src/assets/css/_mixin.scss

@@ -357,7 +357,7 @@
 	  .el-range-input {
 		background: none;
 		color: $color;
-		flex: 1;
+		flex-grow: 1;
 		font-size: calcvw(14);
 		&::placeholder {
 		  color: $placeholderColor;

src/components/main.vue

@@ -40,11 +40,10 @@ export default {
       const homeGetUrlRes = await this.$api.homeGetUrl();
       const { returnCode, data } = homeGetUrlRes;
       if (returnCode === "0") {
-        console.log(homeGetUrlRes, 'homeGetUrlRes');
+        console.log(homeGetUrlRes, "homeGetUrlRes");
         this.setUrl(data);
       }
     },
   },
 };
 </script>
-

src/components/tool/dialog.vue

@@ -79,7 +79,7 @@ $dialog-border-radius: 20px;
         border-radius: $dialog-border-radius $dialog-border-radius 0 0;
 
         .el-dialog__title {
-            flex: 1;
+            flex-grow: 1;
             font-size: 21px;
             font-weight: bold;
             color:#8A4E22;

src/views/BarCode/copms/list.vue

@@ -34,7 +34,7 @@ export default {
     color: #454545;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/Faq.vue

@@ -11,13 +11,8 @@
         >
           <button
             :class="['nav-link', { active: current === tmp.type }]"
-            :id="tmp.type + '-tab'"
-            data-bs-toggle="tab"
-            :data-bs-target="'#' + tmp.type"
-            type="button"
-            role="tab"
-            :aria-controls="tmp.type"
-            aria-selected="true"
+            data-toggle="pill"
+            :href="`#${tmp.type}`"
             @click="jump(i)"
           >
             {{ tmp.name }}
@@ -35,8 +30,6 @@
           :key="i"
           :class="['tab-pane', 'fade', { 'show active': current === tmp.type }]"
           :id="tmp.type"
-          role="tabpanel"
-          :aria-labelledby="tmp.type + '-tab'"
         >
           <faqTable :list="tmp.data" @toTableFather="receiveTableFather" />
           <pages
@@ -227,6 +220,7 @@ export default {
       border: 0;
       color: #454545;
       font-size: 15px;
+      background: none;
       &.active,
       &:hover {
         border-bottom: 3px solid #f26335;

src/views/Business/Notice.vue

@@ -11,13 +11,8 @@
         >
           <button
             :class="['nav-link', { active: $route.query.type === tmp.type }]"
-            :id="tmp.type + '-tab'"
-            data-bs-toggle="tab"
-            :data-bs-target="'#' + tmp.type"
-            type="button"
-            role="tab"
-            :aria-controls="tmp.type"
-            aria-selected="true"
+            data-toggle="pill"
+            :href="`#${tmp.type}`"
             @click="jump(i)"
           >
             {{ tmp.name }}
@@ -34,8 +29,6 @@
             { 'show active': $route.query.type === tmp.type },
           ]"
           :id="tmp.type"
-          role="tabpanel"
-          :aria-labelledby="tmp.type + '-tab'"
         >
           <list :list="tmp.data" @toListFather="receiveListChild" />
           <pages :currPage="pageParams.currPage" :pageSize="pageParams.pageSize" :total="pageParams.total" @getLimit="receivePagesChild"/>
@@ -181,6 +174,7 @@ export default {
       border: 0;
       color: #454545;
       font-size: 15px;
+      background: none;
       &.active,
       &:hover {
         border-bottom: 3px solid #f26335;

src/views/Business/Training.vue

@@ -21,13 +21,8 @@
               >
                 <button
                   :class="['nav-link', { active: i === 0 }]"
-                  :id="tmp.id"
-                  data-bs-toggle="tab"
-                  data-bs-target="#home"
-                  type="button"
-                  role="tab"
-                  aria-controls="home"
-                  aria-selected="true"
+                  data-toggle="pill"
+                  :href="`#${tmp.id}`"
                   @click="handelTab(i)"
                 >
                   {{ tmp.name }}
@@ -42,9 +37,7 @@
                   { show: i === 0 },
                   { active: i === 0 },
                 ]"
-                id="home"
-                role="tabpanel"
-                :aria-labelledby="tmp.id"
+                :id="tmp.id"
                 v-for="(tmp, i) in tabs"
                 :key="i"
               >
@@ -232,6 +225,7 @@ export default {
         padding-left: 30px;
         padding-right: 30px;
         font-size: 15px;
+        background: none;
         &.active,
         &:hover {
           border-bottom: 3px solid #f26335;

src/views/Business/copms/bgxz.vue

@@ -80,7 +80,7 @@ export default {
           transform: rotate(45deg);
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/copms/download-list.vue

@@ -34,7 +34,7 @@ export default {
     color: #454545;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/copms/list.vue

@@ -34,7 +34,7 @@ export default {
     color: #454545;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/copms/table.vue

@@ -39,7 +39,7 @@ export default {
         padding-left: 30px;
       }
       &:nth-child(2) {
-        flex: 1;
+        flex-grow: 1;
       }
       &:nth-child(3) {
         width: 125px;

src/views/Business/copms/tmgg.vue

@@ -86,7 +86,7 @@ export default {
           color: rgba(0, 121, 158, 1);
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/copms/zcfg.vue

@@ -70,7 +70,7 @@ export default {
       cursor: pointer;
       span {
         &:nth-child(1) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Business/copms/zxcxgj.vue

@@ -82,7 +82,7 @@ export default {
     flex-wrap: wrap;
     //justify-content: space-around;
     li {
-      flex: 1;
+      flex-grow: 1;
       margin: 0 15px;
       padding: 15px 0;
       text-align: center;

src/views/Djwh/comps/list.vue

@@ -31,7 +31,7 @@ export default {
     padding: 20px 0;
     margin: 0;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -45,7 +45,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
           cursor: pointer;
         }

src/views/Home/comps/list.vue

 <template>
   <div class="list">
     <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
-      <div class="col-9 col-lg-10 list-left">
+      <div class="col-9 col-md-10 list-left">
         <span></span>
         <span :title="tmp.title">{{ tmp.title }}</span>
       </div>
-      <div class="col-3 col-lg-2 list-right">{{ tmp.time }}</div>
+      <div class="col-3 col-md-2 list-right">{{ tmp.time }}</div>
     </div>
     <div class="row">
       <div class="col">
@@ -50,7 +50,7 @@ export default {
     margin: 0;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       color: #414345;
@@ -66,7 +66,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Home/comps/list2.vue

@@ -29,7 +29,7 @@ export default {
     margin: 0;
     cursor: pointer;
     .li {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       font-size: 14px;
@@ -45,7 +45,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Home/comps/notice.vue

@@ -128,6 +128,7 @@ export default {
       right: 19px;
       top: 19px;
       cursor: pointer;
+      z-index: 9;
     }
     .container {
       padding: 0;

src/views/Home/comps/other-list.vue

@@ -33,7 +33,7 @@ export default {
     margin: 0;
     cursor: pointer;
     .li {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       font-size: 14px;
@@ -49,7 +49,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Home/comps/yyly-list.vue

@@ -28,7 +28,7 @@ export default {
     padding: 6.1px 0;
     margin: 0;
     .li {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       cursor: pointer;
@@ -45,7 +45,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Home/index.vue

@@ -99,13 +99,8 @@
               >
                 <button
                   :class="['nav-link', { active: i === 0 }]"
-                  :id="tmp.type + '-tab'"
-                  data-bs-toggle="tab"
-                  :data-bs-target="'#' + tmp.type"
-                  type="button"
-                  role="tab"
-                  :aria-controls="tmp.type"
-                  aria-selected="true"
+                  data-toggle="pill"
+                  :href="`#${tmp.type}-tab`"
                 >
                   <span>{{ tmp.name }}</span>
                 </button>
@@ -114,8 +109,6 @@
             <div class="tab-content marginTop10">
               <div
                 class="tab-pane fade show active"
-                role="tabpanel"
-                aria-labelledby="yaowen-tab"
               >
                 <list :list="news[0].data" />
               </div>
@@ -249,39 +242,20 @@
             <li class="nav-item col-lg-2" role="presentation">
               <button
                 class="nav-link active"
-                id="home-tab"
-                data-bs-toggle="tab"
-                data-bs-target="#csxx"
-                type="button"
-                role="tab"
-                aria-controls="home"
-                aria-selected="true"
+                href="#home-tab"
+                data-toggle="pill"
               >
                 <span>厂商信息</span>
               </button>
             </li>
             <li class="nav-item col-lg-2" role="presentation">
-              <button
-                class="nav-link"
-                id="profile-tab"
-                data-bs-toggle="tab"
-                data-bs-target="#cpxx"
-                type="button"
-                role="tab"
-                aria-controls="profile"
-                aria-selected="false"
-              >
+              <button class="nav-link" href="#profile-tab" data-toggle="pill">
                 <span>产品信息</span>
               </button>
             </li>
           </ul>
           <div class="tab-content" id="myTabContent">
-            <div
-              class="tab-pane fade show active"
-              id="csxx"
-              role="tabpanel"
-              aria-labelledby="home-tab"
-            >
+            <div class="tab-pane fade show active" id="home-tab">
               <div class="chaxun">
                 <div class="chaxun-kj">
                   <div class="row">
@@ -321,25 +295,37 @@
                 </div>
               </div>
             </div>
-            <div
-              class="tab-pane fade"
-              id="cpxx"
-              role="tabpanel"
-              aria-labelledby="profile-tab"
-            >
+            <div class="tab-pane fade" id="profile-tab">
               <div class="chaxun">
                 <div class="chaxun-kj">
                   <div class="row">
-                    <div class="col-lg-9 chaxun-middle">
+                    <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">
                       <el-input
-                          placeholder="请输入13位或14位的商品条码"
-                          v-model="chaxun.keywords"
-                          clearable
+                        placeholder="请输入13位或14位的商品条码"
+                        v-model="chaxun.keywords"
+                        clearable
                       >
                       </el-input>
                     </div>
                     <div class="col-lg-3 chaxun-right">
-                      <button @click="toSearch(chaxun.type2,chaxun.keywords,'product')">境内条码查询</button>
+                      <button
+                        @click="
+                          toSearch(chaxun.type2, chaxun.keywords, 'product')
+                        "
+                      >
+                        境内条码查询
+                      </button>
                     </div>
                   </div>
                 </div>
@@ -415,7 +401,7 @@
                       alt=""
                   /></a>
                 </div>
-                <list2 :list="djwh.data" @toList2Father="djwhReceive"/>
+                <list2 :list="djwh.data" @toList2Father="djwhReceive" />
               </div>
               <div class="ztjj">
                 <div class="home-bottom-cate" @click="handelHomeBottomCate(2)">
@@ -428,7 +414,7 @@
                       alt=""
                   /></a>
                 </div>
-                <list2 :list="ztjj.data" @toList2Father="ztjjReceive"/>
+                <list2 :list="ztjj.data" @toList2Father="ztjjReceive" />
               </div>
               <div class="yyly">
                 <div class="home-bottom-cate" @click="handelHomeBottomCate(3)">
@@ -632,7 +618,7 @@ export default {
       ],
       chaxun: {
         type: "1",
-        type2:'',
+        type2: "",
         options: [
           {
             label: "根据厂商识别代码查询",
@@ -646,10 +632,8 @@ export default {
             label: "根据厂商地址查询",
             value: "3",
           },
-
-        ],
-        options2: [
         ],
+        options2: [],
         keywords: "",
       },
       whbsxtcy: [
@@ -756,7 +740,7 @@ export default {
           ico: require("../../assets/image/home/dzfw-ico13.png"),
           name: "条码教育培训平台",
           isChecked: true,
-          url: 'https://training.ancc.org.cn/portal',
+          url: "https://training.ancc.org.cn/portal",
           type: "link",
         },
         {
@@ -871,47 +855,47 @@ export default {
         data: [
           {
             name: "零售",
-            url: '/News/Retail',
+            url: "/News/Retail",
           },
           {
             name: "物流",
-            url: '/News/Logistics',
+            url: "/News/Logistics",
           },
           {
             name: "医疗卫生",
-            url: '/News/Health',
+            url: "/News/Health",
           },
           {
             name: "食品安全追溯",
-            url: '/News/FoodSafety',
+            url: "/News/FoodSafety",
           },
           {
             name: "电子商务",
-            url: '/News/ECommerce',
+            url: "/News/ECommerce",
           },
           {
             name: "移动商务",
-            url: '/News/MCommerce',
+            url: "/News/MCommerce",
           },
           {
             name: "物联网",
-            url: '/News/IoT',
+            url: "/News/IoT",
           },
           {
             name: "其他",
-            url: '/News/Other',
+            url: "/News/Other",
           },
           {
             name: "国家食品（产品）安全追溯平台",
-            url: 'http://www.chinatrace.org/',
+            url: "http://www.chinatrace.org/",
           },
           {
             name: "国家产品质量信用平台",
-            url: 'http://zlxy.ancc.org.cn/',
+            url: "http://zlxy.ancc.org.cn/",
           },
           {
             name: "国家物联网标识管理与公共服务平台",
-            url: 'https://www.iotroot.com/',
+            url: "https://www.iotroot.com/",
           },
         ],
       },
@@ -919,94 +903,94 @@ export default {
         data: [
           {
             name: "国家射频识别产品质量检验检测中心",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-1'
-            }
+              id: "1-1",
+            },
           },
           {
             name: "国家条码质量检验检测中心",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-2'
-            }
+              id: "1-2",
+            },
           },
           {
             name: "中国自动识别技术协会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-3'
-            }
+              id: "1-3",
+            },
           },
           {
             name: "中国条码技术与应用协会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-4'
-            }
+              id: "1-4",
+            },
           },
           {
             name: "《中国自动识别技术》杂志社电子版",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-5'
-            }
+              id: "1-5",
+            },
           },
           {
             name: "中国ECR委员会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-6'
-            }
+              id: "1-6",
+            },
           },
           {
             name: "全国物品编码标准化技术委员会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-7'
-            }
+              id: "1-7",
+            },
           },
           {
             name: "全国物流信息管理标准化技术委员会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-8'
-            }
+              id: "1-8",
+            },
           },
           {
             name: "全国自动识别与数据采集分委员会",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-9'
-            }
+              id: "1-9",
+            },
           },
           {
             name: "物联网标识工作组",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-10'
-            }
+              id: "1-10",
+            },
           },
           {
             name: "全球产品电子代码中国管理中心",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-11'
-            }
+              id: "1-11",
+            },
           },
           {
             name: "中国UNSPSC动态维护管理中心",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-12'
-            }
+              id: "1-12",
+            },
           },
           {
             name: "北京东方捷码科技开发中心",
-            url: '/Org/Sites',
+            url: "/Org/Sites",
             query: {
-              id: '1-13'
-            }
+              id: "1-13",
+            },
           },
         ],
       },
@@ -1041,13 +1025,13 @@ export default {
   methods: {
     handelHomeBottomCate(i) {
       if (i === 1) {
-        window.open('/djwh', '_blank');
+        window.open("/djwh", "_blank");
       } else if (i === 2) {
-        window.open('/News/DepthTopics', '_blank');
+        window.open("/News/DepthTopics", "_blank");
       } else if (i === 3) {
-        window.open('/News/index', '_blank');
+        window.open("/News/index", "_blank");
       } else if (i === 4) {
-        window.open('/Org/Sites', '_blank');
+        window.open("/Org/Sites", "_blank");
       }
     },
     toSearch(type, keyword, infoType) {
@@ -1203,9 +1187,7 @@ export default {
         page: 1,
         limit: 5,
       };
-      const homeGetsdztListTopNewsRes = await this.$api.news.sdztList(
-        params
-      );
+      const homeGetsdztListTopNewsRes = await this.$api.news.sdztList(params);
       const { returnCode, data } = homeGetsdztListTopNewsRes;
       if (returnCode === "0") {
         console.log(homeGetsdztListTopNewsRes, "专题聚焦");
@@ -1215,10 +1197,10 @@ export default {
     // 党建文化列表点击
     djwhReceive(msg) {
       let routeData = this.$router.resolve({
-        path: '/News/Msg',
+        path: "/News/Msg",
         query: {
-          id: msg.id
-        }
+          id: msg.id,
+        },
       });
       window.open(routeData.href, "_blank");
     },
@@ -1420,7 +1402,6 @@ export default {
         background-size: 100% 100%;
         content: "";
       }
-
     }
 
     img {
@@ -1440,7 +1421,8 @@ export default {
         &::before {
           width: 10px;
           height: 18px;
-          background: url("../../assets/image/home/prevArrow-hover.png") no-repeat;
+          background: url("../../assets/image/home/prevArrow-hover.png")
+            no-repeat;
         }
       }
 
@@ -1452,7 +1434,8 @@ export default {
         &::before {
           width: 10px;
           height: 18px;
-          background: url("../../assets/image/home/nextArrow-hover.png") no-repeat;
+          background: url("../../assets/image/home/nextArrow-hover.png")
+            no-repeat;
         }
       }
     }
@@ -1489,7 +1472,6 @@ export default {
   }
 
   .newsBanner {
-
     .slick-arrow {
       width: 40px;
       height: 50px;
@@ -1505,7 +1487,7 @@ export default {
           left: 50%;
           top: 50%;
           transform: translate(-50%, -50%);
-            background: url("../../assets/image/home/prevArrow-hover.png")
+          background: url("../../assets/image/home/prevArrow-hover.png")
             no-repeat;
         }
       }
@@ -1521,7 +1503,7 @@ export default {
           left: 50%;
           top: 50%;
           transform: translate(-50%, -50%);
-            background: url("../../assets/image/home/nextArrow-hover.png")
+          background: url("../../assets/image/home/nextArrow-hover.png")
             no-repeat;
         }
       }
@@ -1947,7 +1929,7 @@ export default {
     border-bottom: 1px solid #c5d8ee;
 
     .nav-item {
-      flex: 1;
+      flex-grow: 1;
     }
 
     span {
@@ -1986,6 +1968,9 @@ export default {
           border: 0;
         }
       }
+      button {
+        background: none;
+      }
     }
 
     .nav-link {

src/views/Home/sousuo.vue

@@ -27,13 +27,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'')">
             <button
               class="nav-link active"
-              id="home-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#home"
-              type="button"
-              role="tab"
-              aria-controls="home"
-              aria-selected="true"
+              href="#qbwt"
+              data-toggle="pill"
             >
               <span>全部问题</span>
             </button>
@@ -41,13 +36,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'1')">
             <button
               class="nav-link"
-              id="profile-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#profile"
-              type="button"
-              role="tab"
-              aria-controls="profile"
-              aria-selected="false"
+              href="#bzky"
+              data-toggle="pill"
             >
               <span>标准科研</span>
             </button>
@@ -55,13 +45,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'2')">
             <button
               class="nav-link"
-              id="profile-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#profile"
-              type="button"
-              role="tab"
-              aria-controls="profile"
-              aria-selected="false"
+              href="#zcfg"
+              data-toggle="pill"
             >
               <span>政策法规</span>
             </button>
@@ -69,13 +54,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'3,31,32')">
             <button
               class="nav-link"
-              id="profile-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#profile"
-              type="button"
-              role="tab"
-              aria-controls="profile"
-              aria-selected="false"
+              href="#zxdt"
+              data-toggle="pill"
             >
               <span>资讯动态</span>
             </button>
@@ -83,13 +63,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'5')">
             <button
               class="nav-link"
-              id="profile-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#profile"
-              type="button"
-              role="tab"
-              aria-controls="profile"
-              aria-selected="false"
+              href="#yyly"
+              data-toggle="pill"
             >
               <span>应用领域</span>
             </button>
@@ -97,13 +72,8 @@
           <li class="nav-item" role="presentation" @click="initListFn(1,'6')">
             <button
               class="nav-link"
-              id="profile-tab"
-              data-bs-toggle="tab"
-              data-bs-target="#profile"
-              type="button"
-              role="tab"
-              aria-controls="profile"
-              aria-selected="false"
+              href="#jszs"
+              data-toggle="pill"
             >
               <span>技术知识</span>
             </button>
@@ -126,24 +96,7 @@
           >
           </el-date-picker> -->
         </div>
-        <div class="tab-content" id="myTabContent">
-          <div
-            class="tab-pane fade show active"
-            id="home"
-            role="tabpanel"
-            aria-labelledby="home-tab"
-          >
-           
-          </div>
-          <div
-            class="tab-pane fade"
-            id="profile"
-            role="tabpanel"
-            aria-labelledby="profile-tab"
-          >
-            
-          </div>
-        </div>
+  
         <sousuoList :list="pageParams.list" />
           <pages
           :currPage="pageParams.currPage"
@@ -310,6 +263,7 @@ export default {
           padding-left: 0;
           padding-right: 0;
           font-size: 15px;
+          background: none;
           &.active,
           &:hover {
             border-bottom: 4px solid #f26335;

src/views/MyManage/Admin/certificationDetail.vue

@@ -615,7 +615,7 @@ export default {
       }
 
       .value {
-        flex: 1;
+        flex-grow: 1;
         padding-left: 10px;
         color: #414345;
         overflow: hidden;

src/views/MyManage/Admin/checkSearchTable.vue

@@ -306,7 +306,7 @@ export default {
 
   .gs-ac-st-table {
     width: 100%;
-    flex: 1;
+    flex-grow: 1;
     overflow: hidden;
   }
 

src/views/MyManage/Admin/entInfo.vue

@@ -214,7 +214,7 @@ export default {
 
   .gs-ac-st-table {
     width: 100%;
-    flex: 1;
+    flex-grow: 1;
     overflow: hidden;
   }
 

src/views/MyManage/Admin/log.vue

@@ -215,7 +215,7 @@ export default {
 
   .gs-ac-st-table {
     width: 100%;
-    flex: 1;
+    flex-grow: 1;
     overflow: hidden;
   }
 

src/views/MyManage/Admin/statusChange.vue

@@ -235,7 +235,7 @@ export default {
 
   .gs-ac-st-table {
     width: 100%;
-    flex: 1;
+    flex-grow: 1;
     overflow: hidden;
   }
 

src/views/MyManage/comps/dialog.vue

@@ -75,7 +75,7 @@ $dialog-border-radius: 20px;
 
        
         .el-dialog__title {
-            flex: 1;
+            flex-grow: 1;
             font-size: 14px;
             color:#fff!important;
             line-height: 60px;

src/views/News/Ecommerce/copms/list.vue

@@ -34,7 +34,7 @@ export default {
     color: #454545;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/News/comps/list.vue

@@ -33,7 +33,7 @@ export default {
     margin: 0;
      cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
           
         }

src/views/News/comps/list2.vue

@@ -29,7 +29,7 @@ export default {
     margin: 0;
     cursor: pointer;
     >div {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -45,7 +45,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
           cursor: pointer;
           a{

src/views/News/index.vue

@@ -611,7 +611,7 @@ export default {
             @include ellipsis;
             font-size: 14px;
             color: #414345;
-            flex: 1;
+            flex-grow: 1;
           }
         }
       }

src/views/News/msg.vue

@@ -355,7 +355,7 @@ export default {
         margin: 0;
         cursor: pointer;
         > div {
-          flex: 1;
+          flex-grow: 1;
           display: flex;
           align-items: center;
           @include ellipsis;
@@ -370,7 +370,7 @@ export default {
               width: 20px;
             }
             &.name {
-              flex: 1;
+              flex-grow: 1;
               @include ellipsis;
               cursor: pointer;
             }

src/views/News/msgVideo.vue

@@ -369,7 +369,7 @@ export default {
         margin: 0;
 
         > div {
-          flex: 1;
+          flex-grow: 1;
           display: flex;
           align-items: center;
           @include ellipsis;
@@ -384,7 +384,7 @@ export default {
               width: 20px;
             }
             &.name {
-              flex: 1;
+              flex-grow: 1;
               @include ellipsis;
               cursor: pointer;
             }

src/views/Org/Branch.vue

@@ -31,12 +31,8 @@
         <button
           :class="['nav-link', { active: i === 0 }]"
           :id="tmp.id"
-          data-bs-toggle="tab"
-          data-bs-target="#home"
-          type="button"
-          role="tab"
-          aria-controls="home"
-          aria-selected="true"
+          data-toggle="pill"
+          :href="`#${tmp.id}`"
           @click="handelTab(i)"
         >
           {{ tmp.name }}
@@ -46,9 +42,7 @@
     <div class="tab-content" id="myTabContent">
       <div
         :class="['tab-pane', 'fade', {'show': i===0}, {'active': i===0}]"
-        id="home"
-        role="tabpanel"
-        :aria-labelledby="tmp.id"
+        :id="tmp.id"
         v-for="(tmp, i) in tabs"
         :key="i"
       >
@@ -323,7 +317,13 @@ export default {
     justify-content: center;
   }
   .alert-danger {
-    @include alert-variant(#fef1ec, none, #f26335);
+    // @include alert-variant(#fef1ec, none, #f26335);
+    background: #fef1ec;
+    border: none;
+    color: #F26335;
+    svg{
+      margin-right: 10px;
+    }
   }
   .nav-tabs {
     background: #ffffff;
@@ -336,6 +336,7 @@ export default {
       padding-right: 30px;
       // font-family: PingFangSC-Regular, PingFang SC;
       font-size: 15px;
+      background: none;
       &.active,
       &:hover {
         border-bottom: 3px solid #f26335;

src/views/Org/GS1Members.vue

@@ -9,13 +9,8 @@
       >
         <button
           :class="['nav-link', { active: i === 0 }]"
-          :id="tmp.id"
-          data-bs-toggle="tab"
-          data-bs-target="#home"
-          type="button"
-          role="tab"
-          aria-controls="home"
-          aria-selected="true"
+          data-toggle="pill"
+                  :href="`#${tmp.id}`"
           @click="handelTab(i)"
         >
           {{ tmp.name }}
@@ -25,9 +20,7 @@
     <div class="tab-content" id="myTabContent">
       <div
         :class="['tab-pane', 'fade', {'show': i===0}, {'active': i===0}]"
-        id="home"
-        role="tabpanel"
-        :aria-labelledby="tmp.id"
+        :id="tmp.id"
         v-for="(tmp, i) in tabs"
         :key="i"
       >
@@ -542,9 +535,6 @@ export default {
     font-size: 14px;
     justify-content: center;
   }
-  .alert-danger {
-    @include alert-variant(#fef1ec, none, #f26335);
-  }
   .nav-tabs {
     background: #ffffff;
     box-shadow: 0px 3px 10px 0px rgba(4, 64, 141, 0.1);
@@ -555,6 +545,7 @@ export default {
       padding-left: 30px;
       padding-right: 30px;
       font-size: 15px;
+      background: none;
       &.active,
       &:hover {
         border-bottom: 3px solid #f26335;

src/views/Org/comps/table.vue

@@ -37,7 +37,7 @@ export default {
         padding-left: 30px;
       }
       &:nth-child(2) {
-        flex: 1;
+        flex-grow: 1;
       }
       &:nth-child(3) {
         width: 125px;

src/views/Search/external.vue

@@ -163,7 +163,7 @@ export default {
         }
 
         .value {
-          flex: 1;
+          flex-grow: 1;
           font-size: 14px;
           font-weight: 400;
           color: #414345;

src/views/Sell/copms/list.vue

@@ -34,7 +34,7 @@ export default {
     color: #454545;
     cursor: pointer;
     .list-left {
-      flex: 1;
+      flex-grow: 1;
       display: flex;
       align-items: center;
       @include ellipsis;
@@ -48,7 +48,7 @@ export default {
           margin-right: 10px;
         }
         &:nth-child(2) {
-          flex: 1;
+          flex-grow: 1;
           @include ellipsis;
         }
       }

src/views/Service/book.vue

@@ -221,7 +221,7 @@ export default {
       display: flex;
       flex-direction: column;
       justify-content: space-between;
-      flex: 1;
+      flex-grow: 1;
       padding: 20px 20px;
 
       .title {

src/views/User/index.vue

@@ -82,13 +82,13 @@ export default {
   }
 
   .body {
-    flex: 1;
+    flex-grow: 1;
     max-width: 1500px;
     display: flex;
     flex-direction: column;
 
     .content {
-      flex: 1;
+      flex-grow: 1;
       padding-top: 148px;
       text-align: center;
     }

src/views/comps/breadcrumb.vue

@@ -43,6 +43,8 @@ export default {
 .bread-crumb {
   .breadcrumb {
     margin: 20px 0;
+    padding: 0;
+    background: transparent;
     &-item {
       font-size: 12px;
     }

src/views/comps/cate.vue

@@ -32,7 +32,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     .cate-left{
-      flex: 1;
+      flex-grow: 1;
       span{
         cursor: pointer;
       }

src/views/comps/cate2.vue

@@ -27,7 +27,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     .cate-left{
-      flex: 1;
+      flex-grow: 1;
       text-align: center;
     }
   }