fix: 全局样式调整

xinkeaboard-admin/src/pages/decorate/pc/diy_page.less

@@ -446,7 +446,7 @@
   z-index: 12;
   width: 100vw;
   height: 48px;
-  background: linear-gradient(90deg, #FF5216 0%, #FF8A39 100%);
+  background: @theme-linear;
   padding-left: calc(50vw - 605px);
   padding-right: calc(50vw - 605px);
   .left{

xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page.js

@@ -770,9 +770,9 @@ export default class Edit_diy_page extends Component {
                               <div className={`${global.flex_row_between_start}`}>
                                 <div className={diy.instance_tpl_name}>{item.data.insTplName!=undefined&&item.data.insTplName?item.data.insTplName:''}</div>
                                 <a className={diy.top_add}
-                                   onClick={() => this.addTplData('top', item.id)}>{sldSvgIcon('#ff7e28', 19, 19, 'jia')}</a>
+                                   onClick={() => this.addTplData('top', item.id)}>{sldSvgIcon('#036EB8', 19, 19, 'jia')}</a>
                                 <a className={diy.bottom_add}
-                                   onClick={() => this.addTplData('bottom', item.id)}>{sldSvgIcon('#ff7e28', 19, 19, 'jia')}</a>
+                                   onClick={() => this.addTplData('bottom', item.id)}>{sldSvgIcon('#036EB8', 19, 19, 'jia')}</a>
                                 <div className={global.flex_row_end_start} style={{position:'absolute',right:0,top:-30, borderRadius: '3px 3px 0 0',overflow:'hidden',zIndex:4}}>
                                   <div className={`${global.flex_row_center_center} ${diy.opt} ${diy.up}`}
                                        onClick={() => this.handleFloorStyle(item)}>

xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page_head.js

@@ -25,6 +25,7 @@ export default class EditDdiyPageHead extends Component {
       hot_search_words: [],//热搜词
       mall_logo: '',//商城logo
       nav_list: [],//导航列表
+      cat_nav: [],
     };
   }
 
@@ -32,6 +33,7 @@ export default class EditDdiyPageHead extends Component {
   componentDidMount() {
     this.get_base_setting();//获取基本配置信息
     this.get_nav_list();//获取导航列表
+    this.get_cat();
   }
 
   //获取基本配置信息
@@ -74,9 +76,25 @@ export default class EditDdiyPageHead extends Component {
     });
   };
 
+  //获取一级分类，用于左侧分类导航展示数据
+  get_cat = () => {
+    const { dispatch } = this.props;
+    let { cat_nav } = this.state;
+    dispatch({
+      type: 'project/get_cate_2_tree_list',
+      payload: { pId: 0, grade: 1 },
+      callback: (res) => {
+        if (res.state == 200) {
+          cat_nav = res.data;
+          this.setState({ cat_nav });
+        }
+      },
+    });
+  };
+
 
   render() {
-    const { hot_search_words, mall_logo, nav_list } = this.state;
+    const { hot_search_words, mall_logo, nav_list, cat_nav } = this.state;
     return (
       <Fragment>
         {/* 最顶部 start */}
@@ -161,7 +179,7 @@ export default class EditDdiyPageHead extends Component {
             <dl class>
               <dt className={`${styles.ld} ${styles.cart_icon_text_wrap}`}
                   style={{ borderBottom: '1px solid rgb(239, 239, 239)' }}>
-                <span className={styles.iconfont}>{sldSvgIcon('#e2231a',16,16,'youxiang')}</span>
+                <span className={styles.iconfont}>{sldSvgIcon('#036EB8',16,16,'youxiang')}</span>
                 <a onClick={(e) => e.preventDefault()}>{sldComLanguage('发布需求')}</a>
                 {/*<div className={styles.cart_goods_num}>0</div>*/}
               </dt>
@@ -176,6 +194,19 @@ export default class EditDdiyPageHead extends Component {
             <div className={styles.product_sort}>
               <img src={require('@/assets/pc_diy_top_all_cat_icon.png')}/>
               <span className={styles.sort}>{sldComLanguage('产品分类')}</span>
+              <div className={`${styles.s1}`}>
+                <div className={`${styles.category_sort}`}>
+                    <ul className={`${styles.menu_wrap}`}>
+                      {cat_nav.map((item, index) => (
+                        <li className={`${styles.menu_item}`}>
+                          <a key={index} className={`${styles.first_cat}`} onClick={(e) => e.preventDefault()}>
+                            {item.categoryName}
+                          </a>
+                        </li>
+                      ))}
+                    </ul>
+                </div>
+              </div>
             </div>
             <nav>
               <li><a onClick={(e) => e.preventDefault()}>{sldComLanguage('首页')}</a></li>

xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page_head.less

@@ -1,4 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
+@import "../../../../themeColor.less";
 
 .header_wrap {
   width: 100%;
@@ -208,10 +209,10 @@
       z-index: 11;
       height: 38px;
       margin-bottom: 3px;
-      border: 2px solid #e2231a;
+      border: 2px solid @theme-color;
 
       .form {
-        background-color: #e2231a;
+        background-color: @theme-color;
         height: 34px;
         overflow: hidden;
 
@@ -239,7 +240,7 @@
 
         .button {
           width: 103px;
-          background: #e2231a;
+          background: @theme-color;
           font-size: 16px;
           font-weight: 600;
           color: #fff;
@@ -270,7 +271,7 @@
           }
 
           &:hover {
-            color: #e2231a;
+            color: @theme-color;
           }
         }
       }
@@ -292,7 +293,7 @@
       .cart_goods_num {
         font: 11px/16px Verdana;
         color: #fff;
-        background: #e2231a;
+        background: @theme-color;
         text-align: center;
         display: inline-block;
         height: 16px;
@@ -315,7 +316,7 @@
         .iconfont {
           display: inline-block;
           margin: 0 13px 0 12px;
-          color: #e2231a;
+          color: @theme-color;
           font-weight: 600;
           vertical-align: bottom;
           font-size: 17px;
@@ -478,7 +479,7 @@
             margin-top: 10px;
 
             &:hover {
-              color: #e2231a;
+              color: @theme-color;
             }
           }
         }
@@ -508,7 +509,7 @@
         height: 44px;
         text-align: center;
         color: #fff;
-        background-color: #f30213;
+        background-color: @theme-color;
         line-height: 44px;
         cursor: pointer;
       }
@@ -527,7 +528,7 @@
     overflow: visible;
     width: 187px;
     height: 100%;
-    background: #e2231a;
+    background: @theme-color;
     color: #fff;
     font-size: 15px;
     letter-spacing: 3px;
@@ -541,7 +542,7 @@
     padding: 0 50px 0 26px;
 
     &:hover {
-      #category_sort {
+      .s1 {
         display: block;
       }
     }
@@ -550,11 +551,61 @@
       width: 12px;
       height: 12px;
     }
+
+    .s1 {
+      display: none;
+      width: 187px;
+      z-index: 999;
+      position: absolute;
+      top: 38px;
+      left: 0;
+
+      .category_sort {
+        box-sizing: border-box;
+        height: 306px;
+        width: max-content;
+        //z-index: 9;
+        box-shadow: -1px 5px 10px 0px #ddd;
+      }
+
+      .menu_wrap {
+        background-color: #fff;
+
+      }
+
+      .menu_item {
+        border-left: 3px solid transparent;
+        //height: 38px;
+        line-height: 38px;
+
+        &:hover {
+          border-left-color: @theme-color;
+        }
+      }
+
+      .first_cat {
+        display: block;
+        font-size: 14px;
+        letter-spacing: normal;
+        overflow: hidden;
+        padding: 0 10px 0 15px;
+        position: relative;
+        text-overflow: ellipsis;
+        width: 100%;
+
+        &:hover {
+          background-color: @theme-color;
+          color: #fff;
+        }
+      }
+    }
+
+    
   }
 
   nav {
     width: 1013px;
-    height: 30px;
+    height: 100%;
     margin-left: 8px;
     display: flex;
     align-items: center;
@@ -575,8 +626,8 @@
     }
 
     a:hover {
-      color: #e2231a;
-      border-bottom: 3px solid #e2231a;
+      color: @theme-color;
+      border-bottom: 3px solid @theme-color;
     }
   }
 }

xinkeaboard-admin/src/pages/decorate/pc/home/main_banner_pc.js

@@ -311,7 +311,7 @@ export default class MainBannerPc extends Component {
           <div className={`${styles.w_sld_react_1210} ${styles.adv_30}`}>
             <div className={`${styles.adv_30_wrap}`}>
               <div className={`${styles.home_slider}`}>
-                <div className={`${styles.s1}`}>
+                {/* <div className={`${styles.s1}`}>
                   <div className={`${styles.category_sort}`}>
                     <ul className={`${styles.menu_wrap}`}>
                       {cat_nav.map((item, index) => (
@@ -323,7 +323,7 @@ export default class MainBannerPc extends Component {
                       ))}
                     </ul>
                   </div>
-                </div>
+                </div> */}
 
                 <div className={`${styles.s2}`}>
                   <div className={`${styles.scroller}`}>

xinkeaboard-admin/src/pages/decorate/pc/pcdecorate.less

@@ -2679,8 +2679,8 @@ a {
 
 .adv_28 .adv_28_wrap .industry_booth .btn_main {
   color: #fff;
-  border: solid 1px #00985e;
-  background-color: #00985e;
+  border: solid 1px @theme-color;
+  background: @theme-color;
 }
 /* adv_28-end */
 
@@ -2812,6 +2812,7 @@ a {
 .adv_30 .adv_30_wrap {
   height: auto;
   min-height: 306px;
+  position: relative;
 }
 
 .adv_30 .adv_30_wrap .category_sort {
@@ -2867,9 +2868,11 @@ a {
 }
 
 .adv_30 .adv_30_wrap .s1 {
-  display: none;
+  // display: none;
   width: 187px;
-  float: left;
+  // position: absolute;
+  // z-index: 999;
+  // float: left;
 }
 
 .adv_30 .adv_30_wrap .s2 {

xinkeaboard-seller/src/pages/store/category.js

@@ -176,6 +176,7 @@ export default class Category extends Component {
     sele_key: 'innerLabelId',
     sele_name: 'innerLabelName',
     diy: true,
+    allowClear: true
   };
 
   componentDidMount() {

xinkeaboard-web/assets/style/store/storeHeader.scss

@@ -364,9 +364,9 @@
 
     .sld_store_nav {
       width: 100%;
-      height: 38px;
-      line-height: 38px;
-      background-color: #080808;
+      height: 48px;
+      line-height: 48px;
+      background: $colorLinear;
 
       .sld_all_store_cat {
         &:hover {
@@ -459,9 +459,11 @@
         &.sld_all_store_cat {
           position: relative;
           width: 200px;
-          background-color: #ffffff;
-          color: #333333;
-          font-size: 14px;
+          height: 100%;
+          // background-color: #ffffff;
+          font-weight: 400;
+          font-size: 12px;
+          color: #FFFFFF;
           padding: 0;
           cursor: pointer;
 
@@ -473,22 +475,39 @@
         }
 
         a {
-          font-size: 14px;
+          font-size: 12px;
           color: #fff;
         }
       }
 
       ul {
+        display: flex;
+        align-items: center;
         width: 1210px;
         margin: 0 auto;
         position: relative;
+
+        li {
+          height: 100%;
+
+          &.active {
+            background-color:  #F6F8FA;
+            
+            a {
+              color: #282E30;
+            }
+          }
+        }
       }
 
       .sld_store_cat_horizontal {
+        display: flex;
+        align-items: center;
         position: absolute;
         left: 200px;
         width: 735px;
-        height: 38px;
+        // height: 38px;
+        height: 100%;
         overflow: hidden;
       }
     }
@@ -669,16 +688,16 @@
     opacity: 0.5;
     position: absolute;
     right: 300px;
-    top: 8px;
+    // top: 8px;
   }
   .search_modle {
     width: 282px;
     position: absolute;
     right: 0;
-    height: 38px;
+    height: 100%;
     .search_input {
       width: 100%;
-      height: 20px;
+      height: 32px;
       background: #ffffff;
       border-radius: 2px 0 0 2px;
       display: block;
@@ -689,14 +708,14 @@
     .search_input_button {
       display: block;
       width: 72px;
-      height: 20px;
+      height: 32px;
       background: $colorMain;
       border-radius: 0 2px 2px 0;
       font-size: 12px;
       //font-family: Microsoft YaHei;
       font-weight: 400;
       color: #ffffff;
-      line-height: 20px;
+      line-height: 32px;
       text-align: center;
       cursor: pointer;
     }

xinkeaboard-web/components/NavTopBar.vue

@@ -77,7 +77,7 @@
           <li @click="goToByPush('/article')">
             <div class="li_item">{{ L["服务中心"] }}</div>
           </li>
-          <li>
+          <li v-if="!!google">
           <div class="li_item">
             <div id=google_translate_element></div>
 
@@ -278,7 +278,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
           display: flex;
           justify-content: center;
           align-items: center;
-          min-width: 40px;
+          width: max-content;
           white-space: nowrap;
           border-right: 1px solid #ddd;
           padding: 0 10px;
@@ -319,7 +319,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
               }
 
               &:before {
-                top: 8px;
+                top: 6px;
                 border-top: 5px solid #888;
               }
 

xinkeaboard-web/components/Store/HeaderCat.vue

@@ -104,7 +104,7 @@
       <div class="sld_store_nav">
         <ul class="clearfix">
           <li class="sld_all_store_cat">
-            <p class="all_type" style="font-weight: bold">
+            <p class="all_type">
               <span>{{ L["本店全部分类"] }}</span> <i class="iconfont"></i>
             </p>
             <ul class="sld_store_first_cat">
@@ -135,25 +135,25 @@
             </ul>
           </li>
           <ul class="sld_store_cat_horizontal" v-if="storeData.info.storeName">
-            <li>
+            <li :class="{ 'active': routePath === '/store/'+ calcProductName(storeData.info.storeName) +'_'+ vid }">
               <nuxt-link target="_blank"  :to="'/store/'+ calcProductName(storeData.info.storeName) +'_'+ vid"  >
                 {{ L["首页"] }}
               </nuxt-link>
             </li>
-            <li>
-              <nuxt-link target="_blank" :to="'/store/goods/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >{{
+            <li :class="{'active': routePath === '/store/goods/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid}">
+              <nuxt-link :to="'/store/goods/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >{{
                 L["所有商品"]
               }}</nuxt-link>
             </li>
 
-            <li >
+            <li :class="{ 'active': routePath === '/store/about/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid }">
               <nuxt-link :to="'/store/about/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >{{
                 L["关于我们"]
               }}</nuxt-link>
 
 
             </li>
-            <li>
+            <li :class="{ 'active': routePath === '/store/contact/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid }">
               <nuxt-link :to="'/store/contact/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >{{
                 L["联系我们"]
               }}</nuxt-link>
@@ -213,6 +213,9 @@ const defaultImg = ref("/assets/common_top_logo.png");
 const SAList = ref([]);
 const SAShow = ref(false);
 
+const routePath = computed(() => route.fullPath);
+console.log(routePath, 'routePath')
+
 const go_home = () => {
   window.location.href="/"
 };