Browse Source

fix: 全局样式调整

周玉环 3 days ago
parent
commit
c795b43ff7

+ 9 - 2
xinkeaboard-web/assets/style/store/contac-about.scss

@@ -169,9 +169,16 @@
 
 
 .fence-wide {
-    width: 1200px;
+    width: 100%;
+    height: 100%;
     margin: 0 auto;
     zoom: 1;
+
+    img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+    }
 }
 
 .ly-left {
@@ -208,7 +215,7 @@
 #footer a:hover{color:#dbdbdb;}
 
 /*info*/
-.bannerBox{ background-color:#e2e6f5;height:460px;}
+.bannerBox{ background-color:#e2e6f5;height:520px;width: 100%;}
 .main{background-color:#f3f3f3;padding:50px 0; }
 .picBox{width:375px;margin:0 45px 0 30px;}
 .aboutBox{width:720px;padding:0 30px 0 0; overflow:hidden;zoom:1;font-size: 14px;}

+ 7 - 6
xinkeaboard-web/assets/style/storeList.scss

@@ -65,12 +65,13 @@
         }
     }
     .seller_list_search {
-        padding: 10px 0;
-        height: 46px;
+        display: flex;
+        align-items: center;
+        height: 60px;
         font-size: 12px;
-        padding-top: 8px;
+        // padding-top: 8px;
         background-color: #f7f5f5;
-        vertical-align: middle;
+        // vertical-align: middle;
 
         a {
             display: inline-block;
@@ -99,7 +100,7 @@
         input {
             width: 227px;
             margin-left: 15px;
-            height: 30px;
+            height: 32px;
             border: 1px solid #dcdcdc;
             line-height: 28px;
             padding-left: 8px;
@@ -107,7 +108,7 @@
         }
         button {
             width: 75px;
-            height: 30px;
+            height: 32px;
             background-color: $colorMain;
             color: #fff;
             border: none;

+ 21 - 6
xinkeaboard-web/components/NavCatHeader.vue

@@ -15,7 +15,7 @@
           <nuxt-link to="/" target="_blank">{{L['首页']}}</nuxt-link>
         </li>
         <li v-for="(item, index) in navList.data" :key="index">
-          <a href="javascript:void(0)" @click="navClick(item)">{{
+          <a @click="(e) => navClick(e, item)" :class="{'active': getActive(item)}">{{
             item.navName
           }}</a>
         </li>
@@ -40,6 +40,8 @@ const showMenu = () => {
   showTopMenu.value = true
 }
 
+const routePath = computed(() => route.fullPath);
+
 const hideMenu = () => {
   setTimeout(() => {
     showTopMenu.value = false
@@ -61,7 +63,13 @@ const getNavData = async () => {
 };
 getNavData();
 
-const navClick = (val) => {
+const getActive = (item) => {
+    item = JSON.parse(item.data.replace(/&quot;/g, '"'));
+    return item.link_type === 'url' && routePath.value === quillEscapeToHtml(item.link_value)
+}
+
+const navClick = (e, val) => {
+  e.preventDefault()
   val = JSON.parse(val.data.replace(/&quot;/g, '"'));
   if (val.link_type == "url") {
     //跳转链接地址
@@ -158,6 +166,7 @@ onMounted(() => {
   display: flex;
   align-items: center;
   width: 100%;
+  background-color: #F6F8FA;
 }
 .header {
   width: 1210px;
@@ -180,7 +189,7 @@ onMounted(() => {
     box-sizing: border-box;
     z-index:888;
     a{
-      font-weight: bold;
+      // font-weight: bold;
       font-size: $fontE;
       color: #282E30;
       width: 100%;
@@ -223,17 +232,23 @@ onMounted(() => {
       display: inline-block;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
-      font-weight: bold;
+      // font-weight: bold;
       font-size: $fontE;
       color: #282E30;
       margin: 0 0 0 15px;
       line-height: 45px;
-      padding: 0 3px;
+      padding: 0 5px;
       width: max-content;
+      cursor: pointer;
+      
+      &.active {
+        background-color: $colorMain;
+        color: #fff;
+      }
     }
 
     a:hover {
-      color: $colorMain;
+      // color: $colorMain;
       border-bottom: 3px solid $colorMain;
     }
   }

+ 3 - 3
xinkeaboard-web/components/NavTopBar.vue

@@ -186,14 +186,14 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
 
 .header_wrap {
   width: 100%;
-  height: 38px;
+  height: 44px;
   background-color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
   // padding-bottom: 10px;
   // padding-top: 10px;
-  border-bottom: 1px solid #dbdbdb;
+  // border-bottom: 1px solid #dbdbdb;
 
   .header {
     width: 1210px;
@@ -207,7 +207,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
       white-space: nowrap;
       // overflow: hidden;
       height: 100%;
-      font-weight: bold;
+      // font-weight: bold;
       font-size: 14px;
       color: #282E30;
       line-height: 36px;

+ 1 - 1
xinkeaboard-web/components/SldHomeTopSearch.vue

@@ -234,7 +234,7 @@ a:visited {
 .sld_home_top {
   width: 100%;
   background: #F6F8FA;
-  border-bottom: 1px solid #dbdbdb;
+  // border-bottom: 1px solid #dbdbdb;
 }
 
 .sld_home_top_search {

+ 1 - 1
xinkeaboard-web/pages/store/list/[...slug].vue

@@ -5,7 +5,7 @@
     <NavCatHeader />
     <div class="self_background">
       <div class="sld_store_list">
-      <img class="store_list_banner" :src="banneIMG" />
+      <img class="store_list_banner" :src="banneIMG" v-if="banneIMG"/>
       <div class="seller_list_search clearfix">
         <input
           type="text"