fix: 全局样式调整

xinkeaboard-web/assets/style/contact.scss

@@ -14,15 +14,18 @@
                 margin-bottom: 40px;
                 img{
                     width: 100px;
+                    object-fit: contain;
                 }
                 p{
-                    font-size: 14px;
-                    color: #999;
+                    font-weight: 400;
+                    font-size: 12px;
+                    color: rgba(40,46,48,0.6);
                 }
                 .t1{
-                    font-size: 16px;
-                    color: #333;
-                    margin: 5px 0;
+                   font-weight: 400;
+                   font-size: 14px;
+                   color: #282E30;
+                   margin: 5px 0;
                 }
             }
         }

xinkeaboard-web/assets/style/decorate.scss

@@ -3712,6 +3712,7 @@ a {
 .adv_27_wrap .floor_goods .item .wrap img {
   width: 120px;
   height: 120px;
+  object-fit: contain;
   display: block;
 }
 
@@ -3722,7 +3723,7 @@ a {
   color: #777;
   text-align: center;
   position: relative;
-  background: #eee !important;
+  // background: #eee !important;
   font-weight: 300;
   transition: opacity ease 0.5s;
   margin: 0 auto;

xinkeaboard-web/components/CategorySortTop.vue

@@ -176,7 +176,7 @@ const toGoodsList = (item) => {
     overflow-x: hidden;
     height: 100%;
     direction: rtl;
-    width: 250px;
+    width: 230px;
     &::-webkit-scrollbar {
       /*滚动条整体样式*/
       width : 5px;  /*高宽分别对应横竖滚动条的尺寸*/
@@ -260,7 +260,7 @@ const toGoodsList = (item) => {
         background-color: #fff;
         position: absolute;
         top: 0;
-        left: 250px;
+        left: 230px;
         padding: 10px 0;
         overflow: hidden;
         box-shadow: 0px 5px 10px 0px rgba(153, 153, 153, 0.15);

xinkeaboard-web/components/NavCatHeader.vue

@@ -154,29 +154,30 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-$colorMain: #e2231a !default; //主色、文字选中、搜索
-
+.nav_cat {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 0 240px;
+}
 .header {
   width: 100%;
   height: 45px;
-  margin: 0 auto;
   display: flex;
   justify-content: center;
   overflow: visible;
   position: relative;
-  padding-left: 40px;
   .product_sort {
     position: relative;
     overflow: visible;
-    flex:0 0 250px;
+    width: 230px;
     height: 100%;
     // background: #fff;
     letter-spacing: 0px;
-    line-height: 30px;
+    line-height: 45px;
     display: flex;
     align-items: center;
-    flex-wrap: wrap;
-    justify-content: center;
+    // flex-wrap: wrap;
     cursor: pointer;
     box-sizing: border-box;
     z-index:888;
@@ -184,6 +185,9 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
       font-weight: bold;
       font-size: $fontE;
       color: #282E30;
+      width: 100%;
+      height: 100%;
+      padding-left: 20px;
     }
 
     .category_sort {
@@ -207,7 +211,8 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   }
 
   nav {
-    width: 1013px;
+    flex: 1;
+    width: 100%;
 
     display: flex;
     align-items: center;

xinkeaboard-web/components/NavTopBar.vue

@@ -7,7 +7,7 @@
 <!--          {{ L["您好，欢迎来到"] }}-->
           {{ configInfo.data.basic_site_name }}
         </span>
-        <div v-show="loginFlag">
+        <div v-show="loginFlag" class="login_info">
           <span class="register h1" @click="goToByPush('/member/home')" >{{
             memberInfo.memberNickName || memberInfo.memberName
           }}</span>
@@ -16,7 +16,7 @@
           >
         </div>
 
-        <div v-show="!loginFlag && !isRegisterStatus">
+        <div v-show="!loginFlag && !isRegisterStatus" class="login_info">
           <span class="register h1" @click="goToByPush('/login')">{{
             L["登录"]
           }}</span>
@@ -25,7 +25,7 @@
           }}</span>
         </div>
 
-        <div>
+        <div class="supplier-wrap">
            <span class="supplier h1" @click="goSupplierUrl()"
             >{{ L['供应商'] }}</span
           >
@@ -191,19 +191,22 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-bottom: 10px;
+  // padding-bottom: 10px;
+  padding: 10px 240px;
   // padding-top: 10px;
-  padding-left: 150px;
   border-bottom: 1px solid #dbdbdb;
 
   .header {
     width: 100%;
     height: 33px;
     display: flex;
-    justify-content: space-around;
     align-items: center;
+    justify-content: space-between;
 
     .header_left {
+      flex: 1;
+      white-space: nowrap;
+      // overflow: hidden;
       height: 100%;
       font-weight: bold;
       font-size: 14px;
@@ -211,14 +214,33 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
       line-height: 36px;
       display: flex;
 
+      .supplier-wrap {
+        min-width: 40px;
+        white-space: nowrap;
+      }
+
+      .login_info {
+        white-space: nowrap;
+      }
+
       .hello {
+        max-width: 300px;
+        text-overflow: ellipsis;
+        overflow: hidden;
         margin-right: 20px;
-       
+        padding-left: 20px;
       }
 
       .h1 {
-        margin: 0 5px;
-        padding: 5px 10px;
+        display: inline-block;
+        height: 100%;
+        min-width: 40px;
+        max-width: 200px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        // margin: 0 5px;
+        text-align: center;
+        padding: 0 10px;
         cursor: pointer;
 
         &:hover {
@@ -229,13 +251,18 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
     }
 
     .header_right {
+      display: flex;
+      flex-direction: row-reverse;
+      flex: 1;
+      // overflow: hidden;
+      white-space: nowrap;
       height: 100%;
       font-weight: 400;
       font-size: 14px;
       color: #282E30;
 
       ul {
-        width: 100%;
+        // width: 100%;
         height: 100%;
         display: flex;
         align-items: center;
@@ -249,12 +276,13 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
         }
 
         li {
-          float: left;
-          text-align: center;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          min-width: 40px;
+          white-space: nowrap;
           border-right: 1px solid #ddd;
           padding: 0 10px;
-          height: 33px;
-          line-height: 33px;
           .li_item {
             position: relative;
             cursor: pointer;
@@ -292,7 +320,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
               }
 
               &:before {
-                top: 16px;
+                top: 8px;
                 border-top: 5px solid #888;
               }
 

xinkeaboard-web/components/SldHomeTopSearch.vue

@@ -230,18 +230,17 @@ a:visited {
 }
 
 .sld_home_top_search {
-  height: 80px;
+    height: 80px;
     position: relative;
     z-index: 12;
     width: 100%;
-    margin: 0 auto 0px;
-    padding-left: 0px;
-    padding-right: 0px;
+    // margin: 0 auto 0px;
+    padding: 0 240px;
     display: flex;
     align-items: center;
-    justify-content: space-around;
+    // justify-content: center;
     border-bottom: 1px solid #dbdbdb;
-    margin-bottom: 10px;
+    // margin-bottom: 10px;
     background: #F6F8FA;
   .container_header {
     width: 100%;
@@ -315,8 +314,10 @@ a:visited {
 
   .sld_home_top_search_left {
     height: 100%;
-    position: relative;
-    flex:0 0 200px;
+    // flex:0 0 200px;
+    // position: absolute;
+    // left: 240px;
+    width: 200px;
 
     .sld_logo_wrap {
       height: 100%;
@@ -329,11 +330,18 @@ a:visited {
   }
 
   .sld_seach_wrap {
-    width: 536px;
-    padding-top: 4px;
+    // width: 536px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex: 1;
+    width: 100%;
+    overflow: hidden;
+    padding: 4px 20px;
     position: relative;
 
     .sld_seach_box {
+      width: 536px;
       z-index: 11;
       height: 38px;
       border: 2px solid $colorMain;
@@ -487,10 +495,11 @@ a:visited {
 }
 
 .sld_cart_wrap {
-  position: relative;
+  // position: absolute;
+  // right: 240px;
   z-index: 99;
   height: 40px;
-  flex: 0 0 210px;
+  width: 210px;
   text-align: center;
 
   dl {
@@ -510,7 +519,7 @@ a:visited {
     }
 
     dt {
-      position: absolute;
+      // position: absolute;
       z-index: 3;
       width: 100%;
       height: 38px;