Răsfoiți Sursa

Merge remote-tracking branch 'origin/master'

Gaosheng 19 ore în urmă
părinte
comite
fe330416ae

+ 2 - 2
xinkeaboard-admin/src/components/GlobalHeader/index.js

@@ -9,10 +9,10 @@ import defaultSettings from '@/defaultSettings';
 
 //设置顶部logo
 let main_admin_top_logo_local = require('../../assets/logo1.png');
-let main_admin_top_logo = '';
+let main_admin_top_logo = require('../../assets/login/logo.png');
 let com_img_info = getSldImgSet('com_img_info');
 if (com_img_info != '') {
-    main_admin_top_logo = com_img_info.filter(item => item.name == 'main_admin_top_logo')[0].imageUrl || main_admin_top_logo_local;
+    // main_admin_top_logo = com_img_info.filter(item => item.name == 'main_admin_top_logo')[0].imageUrl || main_admin_top_logo_local;
 }
 
 export default class GlobalHeader extends PureComponent {

+ 1 - 1
xinkeaboard-admin/src/components/SiderMenu/index.less

@@ -104,7 +104,7 @@
   }
 
   .ant-menu.ant-menu-dark .ant-menu-item-selected {
-    background: @theme-color;
+    background: @theme-linear;
   }
 
   .ant-menu-dark {

+ 16 - 16
xinkeaboard-admin/src/defaultSettings.js

@@ -1,18 +1,18 @@
 module.exports = {
-	"navTheme": "dark",
-	"primaryColor": "#00985E",
-  "primaryLightColor": "#98FB98",
-  "primary4LightColor": "#F0FFF0",
-  "primaryCommonColor": "#F5F5F5",
-  "primaryRgbaColor": "0,238,118",
-  "primaryLightRgbaColor": "0,250,154",
-	"layout": "sidemenu",
-	"contentWidth": "Fluid",
-	"fixedHeader": true,
-	"autoHideHeader": false,
-	"fixSiderbar": true,
-	"collapse": true,
-	"menu": {
-		disableLocal:true
-	}
+  navTheme: "dark",
+  primaryColor: "#036EB8",
+  primaryLightColor: "#98FB98",
+  primary4LightColor: "#036EB81A",
+  primaryCommonColor: "#F5F5F5",
+  primaryRgbaColor: "3,110,184",
+  primaryLightRgbaColor: "0,250,154",
+  layout: "sidemenu",
+  contentWidth: "Fluid",
+  fixedHeader: true,
+  autoHideHeader: false,
+  fixSiderbar: true,
+  collapse: true,
+  menu: {
+    disableLocal: true,
+  },
 };

+ 5 - 5
xinkeaboard-admin/src/global.less

@@ -90,7 +90,7 @@ ol {
     color: #fff !important;
     padding: 12px 24px !important;
     border-radius: 4px 4px 0 0 !important;
-    background: @theme-color !important;
+    background: @theme-linear !important;
   }
 
   .ant-modal-title {
@@ -320,7 +320,7 @@ body {
     }
 
     .ant-menu-dark .ant-menu-submenu-title:hover {
-      background-color: @theme-color;
+      // background-color: @theme-color;
     }
 
     :root .ant-select-tree li span.ant-select-tree-switcher.ant-select-tree-switcher_close .ant-select-switcher-icon, :root .ant-select-tree li span.ant-select-tree-switcher.ant-select-tree-switcher_open .ant-select-switcher-icon {
@@ -644,16 +644,16 @@ body {
     }
 
     .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th {
-      background-color: #F0FFF0 !important;
+      background-color: @theme-light4Color !important;
       padding: 10px 8px !important;
     }
 
     .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
-      background-color: #F0FFF0 !important;
+      background-color: @theme-light4Color !important;
     }
 
     .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
-      background-color: #F0FFF0 !important;
+      background-color: @theme-light4Color !important;
     }
 
     .ant-table-scroll > .ant-table-body {

+ 6 - 5
xinkeaboard-admin/src/themeColor.less

@@ -1,10 +1,11 @@
-@theme-color: #00985E;
+@theme-color: #036EB8;
+@theme-linear: linear-gradient( 90deg, #036EB8 0%, #4AA498 100%);
 @theme-rgbColor: 0, 152, 94;
 @theme-light-rgba-Color: 0,250,154;
-@theme-lightColor: #00FF00;
-@theme-light2Color: #98FB98;
-@theme-light3Color: #90EE90;
-@theme-light4Color: #F0FFF0;
+@theme-lightColor: #036EB880;
+@theme-light2Color: #036EB84D;
+@theme-light3Color: #036EB833;
+@theme-light4Color: #036EB81A;
 //@theme-light4Color: #000;
 @theme-commonColor: #F5F5F5;
 

+ 1 - 1
xinkeaboard-seller/src/assets/css/goods.less

@@ -13,7 +13,7 @@
 @theme-light3Color: #90EE90;
 @theme-light4Color: #F0FFF0;
 //@theme-light2Color的rgb
-@theme-light4RgbColor: 240,255,240;
+@theme-light4RgbColor: 3, 110, 184, 0.1;
 //@theme-light4Color: #000;
 @theme-commonColor: #F5F5F5;
 //灰色的rgb

BIN
xinkeaboard-seller/src/assets/login/logo.png


BIN
xinkeaboard-seller/src/assets/login/logo1.png


+ 2 - 2
xinkeaboard-seller/src/components/GlobalHeader/index.js

@@ -8,11 +8,11 @@ import { sldSvgIcon, sldComLanguage, getSldImgSet,loginOut } from '@/utils/utils
 import { specialFlag,apiUrl,imUrl } from '@/utils/sldconfig';
 
 //设置顶部logo
-let main_admin_top_logo = require('../../assets/logo1.png');
+let main_admin_top_logo = require('../../assets/login/logo1.png');
 let main_admin_top_logo_local = main_admin_top_logo;
 let com_img_info = getSldImgSet('com_img_info');
 if (com_img_info != '') {
-    main_admin_top_logo = com_img_info;
+    // main_admin_top_logo = com_img_info;
 }
 export default class GlobalHeader extends PureComponent {
     state = {

+ 1 - 1
xinkeaboard-seller/src/components/GlobalHeader/index.less

@@ -6,7 +6,7 @@
 .header {
   height: 50px;
   padding: 0;
-  background: linear-gradient(90deg, @theme-headerColor 0%, @theme-color 100%);
+  background: @theme-linear;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
   position: relative;
 

+ 3 - 3
xinkeaboard-seller/src/defaultSettings.js

@@ -1,10 +1,10 @@
 module.exports = {
   navTheme: "dark",
-  primaryColor: "#00985E",
+  primaryColor: "#036EB8",
   primaryLightColor: "#98FB98",
-  primary4LightColor: "#F0FFF0",
+  primary4LightColor: "#036EB81A",
   primaryCommonColor: "#F5F5F5",
-  primaryRgbaColor: "0,238,118",
+  primaryRgbaColor: "3,110,184",
   primaryLightRgbaColor: "0,250,154",
   layout: "sidemenu",
   contentWidth: "Fluid",

+ 1 - 1
xinkeaboard-seller/src/global.less

@@ -813,7 +813,7 @@ body {
     color: #fff !important;
     padding: 12px 24px !important;
     border-radius: 4px 4px 0 0 !important;
-    background: @theme-color !important;
+    background: @theme-linear !important;
   }
 
   .ant-modal-title {

+ 3 - 3
xinkeaboard-seller/src/pages/User/Login.js

@@ -16,11 +16,11 @@ import {
 import router from 'umi/router';
 
 const FormItem = Form.Item;
-let admin_login_logo = require('../../assets/logo.png');
+let admin_login_logo = require('../../assets/login/logo.png');
 let main_seller_center_logo_local = admin_login_logo;
 let com_img_login_info = getSldImgSet('com_img_login_info');
 if (com_img_login_info != '') {
-   admin_login_logo = com_img_login_info.filter(item => item.name == 'main_seller_center_logo')[0].imageUrl || main_seller_center_logo_local;
+  //  admin_login_logo = com_img_login_info.filter(item => item.name == 'main_seller_center_logo')[0].imageUrl || main_seller_center_logo_local;
   //admin_login_logo = com_img_info
 }
 const default_login_img = {
@@ -773,7 +773,7 @@ export default class LoginPage extends Component {
             onError={() => this.showDefault('admin_login_left_bg')}
           />
           <div className={`${global.flex_row_center_center} ${styles.login_logo_wrap}`}>
-            <img className={styles.login_logo} src={login_img.main_seller_center_logo} onError={(e) => {
+            <img className={styles.login_logo} src={admin_login_logo} onError={(e) => {
               e.target.onerror = null;
               e.target.src = main_seller_center_logo_local;
             }}/>

+ 7 - 6
xinkeaboard-seller/src/themeColor.less

@@ -1,18 +1,19 @@
-@theme-color: #00985E;
+@theme-color: #036EB8;
+@theme-linear: linear-gradient( 90deg, #036EB8 0%, #4AA498 100%);
 //@theme-color的rgb
 @theme-rgbColor: 0, 152, 94;
 //#00FA9A的rgb色
 @theme-light-rgba-Color: 0,250,154;
-@theme-lightColor: #00FF00;
-@theme-light2Color: #98FB98;
+@theme-lightColor: #036EB880;
+@theme-light2Color: #036EB84D;
 //@theme-light2Color的rgb
 @theme-light2RgbColor: 152,251,152;
 //card的rgb颜色
 @theme-cardColor: 244,255,250;
-@theme-light3Color: #90EE90;
-@theme-light4Color: #F0FFF0;
+@theme-light3Color: #036EB833;
+@theme-light4Color: #036EB81A;
 //@theme-light2Color的rgb
-@theme-light4RgbColor: 240,255,240;
+@theme-light4RgbColor: 3, 110, 184, 0.1;
 //@theme-light4Color: #000;
 @theme-commonColor: #F5F5F5;
 //灰色的rgb

+ 43 - 20
xinkeaboard-web/assets/style/decorate.scss

@@ -956,7 +956,7 @@
 .adv_04_wrap .floor_title h2 {
   width: 100%;
   line-height: 35px;
-  text-align: center;
+  // text-align: center;
   margin: 0 auto;
   font-size: 28px;
   color: #333;
@@ -996,16 +996,21 @@
   float: left;
   width: 234px;
   // height: 287px;
-  margin: 0 10px 10px 0;
+  // margin: 0 10px 10px 0;
   padding: 10px;
   background-color: #fff;
   box-sizing: border-box;
 }
 
-.adv_04_wrap .floor_goods .item:nth-child(5n + 5) {
-  margin-right: 0 !important;
+.adv_04_wrap .floor_goods .item:nth-child(n + 6) {
+  border-top: 1px solid #f2f2f2;
 }
 
+.adv_04_wrap .floor_goods .item {
+  border-right: 1px solid #f2f2f2;
+}
+
+
 .adv_04_wrap .floor_goods .item .wrap {
   width: 172px;
   text-align: center;
@@ -1013,6 +1018,7 @@
   font-size: 14px;
   position: relative;
 }
+
 .adv_04_wrap .floor_goods .item .wrap:hover .title a{
   color: $colorMain;
 }
@@ -1066,9 +1072,10 @@
 }
 
 .adv_04_wrap .floor_goods .item .wrap .title a {
-  color: #000;
+  font-weight: bold;
+  font-size: 16px;
+  color: #282E30;
   line-height: 19px !important;
-  font-size: 15px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -3834,10 +3841,11 @@ a {
 }
 
 .adv_28_wrap .industry-booth .prod-txt {
-  font-size: 15px;
+  font-weight: bold;
+  font-size: 16px;
+  color: #282E30;
   line-height: 24px;
   height: 48px;
-  color: #000;
   display: -webkit-box;
   overflow: hidden;
   -webkit-line-clamp: 2;
@@ -3884,6 +3892,7 @@ a {
 
 
 .adv_28_wrap .industry-booth .industry-link {
+  position: relative;
   display: block;
   width: 100%;
   height: 100%;
@@ -3910,21 +3919,26 @@ a {
 }
 
 .adv_28_wrap .industry-booth .industry-theme-info {
-  position: relative;
+  position: absolute;
+  bottom: 30px;
 }
 
 .adv_28_wrap .industry-booth .industry-title {
-  font-weight: 500;
-  margin-bottom: 20px;
-  font-size: 22px;
-  line-height: 30px;
-  color: #222;
+  margin-bottom: 40px;
+  font-weight: bold;
+  font-size: 38px;
+  color: #FFFFFF;
+  line-height: 44px;
 }
 
 .adv_28_wrap .industry-booth .soure-now .btn {
-  height: 30px;
-  line-height: 28px;
+  line-height: 42px;
   padding: 0 10px;
+  width: 157px;
+  height: 42px;
+  font-weight: bold;
+  font-size: 16px;
+  color: #FFFFFF;
 }
 
 
@@ -3955,12 +3969,13 @@ a {
 
 
 .home-slider {
-  width: 1210px;
+  // width: 1210px;
+  width: 100%;
   margin: 0 auto;
   position: relative;
-  height: 306px;
+  height: 520px;
   background: #fff;
-  //margin-bottom: 20px;
+  margin-bottom: 40px;
   box-shadow: -1px 5px 10px 0px #ddd;
 }
 .home-slider .s1 {
@@ -3969,10 +3984,17 @@ a {
 }
 
 .home-slider .s2 {
-  width: calc(100% - 500px);
+  width: 100%;
+  height: 100%;
   float: left;
 }
 
+.home-slider-bottom {
+  width: 100%;
+  height: 12px;
+  background: linear-gradient( 90deg, #036EB8 0%, #4AA498 100%);
+}
+
 .home-slider .s3 {
   width: 250px;
   float: left;
@@ -4019,6 +4041,7 @@ a {
 
 .el-carousel {
   width: 100%;
+  height: 100%;
   margin: 0 auto;
 }
 

+ 1 - 1
xinkeaboard-web/assets/style/theme.scss

@@ -13,7 +13,7 @@ $fontE:       14px; //用于常规文字,文章内容等
 $fontF:       12px; //用于次要文字,辅助性文字
 
 // 常规配色设置
-$colorMain:    #00985e!default; //主色、文字选中、搜索
+$colorMain:    #036EB8 !default; //主色、文字选中、搜索
 $colorMain2:   #00985e !default; //主色、文字选中、搜索
 $colorSkeleton: #eee; //骨架屏颜色
 $colorTitle1: #333 !default; //标题、一级标题、一级内容

+ 5 - 4
xinkeaboard-web/components/CategorySortTop.vue

@@ -45,7 +45,7 @@
       </li>
       <!-- 一级分类 end-->
     </ul>
-    <img v-show="showDown" src="/arrows_down_double-34.svg" class="img" />
+    <!-- <img v-show="showDown" src="/arrows_down_double-34.svg" class="img" /> -->
 
   </div>
 </template>
@@ -147,6 +147,7 @@ const toGoodsList = (item) => {
   z-index: 9;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  background-color: #fff;
   .img{
     width: 24px;
     position: absolute;
@@ -184,7 +185,7 @@ const toGoodsList = (item) => {
       /*滚动条里面小方块*/
       border-radius: 10px;
       box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
-      background   : #00985e;
+      background   : $colorMain;
     }
     &::-webkit-scrollbar-track {
       /*滚动条里面轨道*/
@@ -221,8 +222,8 @@ const toGoodsList = (item) => {
       }
 
       &:hover {
-
-        border-left-color: #00985e;
+        background: #F6F8FA;
+        // border-left-color: $colorMain;
 
         .children {
           display: inline-block;

+ 22 - 12
xinkeaboard-web/components/NavCatHeader.vue

@@ -2,11 +2,13 @@
   <div class="nav_cat">
     <div class="header">
       <div class="product_sort" >
-        <img :src="sortUrl" alt />
+        <!-- <img :src="sortUrl" alt /> -->
         <nuxt-link to="/goods/Category" target="_blank" class="sort">
           <span >{{L['产品分类']}}</span>
         </nuxt-link>
-        <!-- <CategorySortTop /> -->
+        <div class="category_sort">
+          <CategorySortTop />
+        </div>
       </div>
       <nav>
         <li v-if="showIndex">
@@ -150,10 +152,11 @@ onMounted(() => {
 $colorMain: #e2231a !default; //主色、文字选中、搜索
 
 .header {
-  width: 1210px;
+  width: 100%;
   height: 45px;
   margin: 0 auto;
   display: flex;
+  justify-content: center;
   overflow: visible;
   position: relative;
   .product_sort {
@@ -161,25 +164,31 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
     overflow: visible;
     flex:0 0 250px;
     height: 100%;
-    background: #00985e;
-    color: #fff;
-    font-size: 16px;
+    background: #fff;
     letter-spacing: 0px;
     line-height: 30px;
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-    justify-content: flex-start;
+    justify-content: center;
     cursor: pointer;
     box-sizing: border-box;
-    padding: 0 0px 0 26px;
     z-index:888;
     a{
-      color: #fff;
+      font-weight: bold;
+      font-size: 16px;
+      color: #282E30;
+    }
+
+    .category_sort {
+      position: absolute;
+      top: 40px;
+      display: none;
     }
 
     &:hover {
-      #category_sort {
+      background: #F6F8FA;
+      .category_sort {
         display: block;
       }
     }
@@ -205,8 +214,9 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
       display: inline-block;
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
-      color: #333333;
-      font-size: 15px;
+      font-weight: bold;
+      font-size: 16px;
+      color: #282E30;
       margin: 0 0 0 10px;
       line-height: 45px;
       padding: 0 3px;

+ 29 - 11
xinkeaboard-web/components/NavTopBar.vue

@@ -17,7 +17,7 @@
         </div>
 
         <div v-show="!loginFlag && !isRegisterStatus">
-          <span class="register h1" @click="goToByPush('/login')" style="border-right: 1px solid #c1c1c1; padding-right: 15px;">{{
+          <span class="register h1" @click="goToByPush('/login')">{{
             L["登录"]
           }}</span>
           <span class="register h1" @click="goToByPush('/register')">{{
@@ -25,7 +25,11 @@
           }}</span>
         </div>
 
-
+        <div>
+           <span class="supplier h1" @click="goSupplierUrl()"
+            >{{ L['供应商'] }}</span
+          >
+        </div>
 
       </div>
 
@@ -141,6 +145,13 @@ const goToByPush = (type, param = {}) => {
     query: param,
   });
 };
+
+const goSupplierUrl = () => {
+  let url = supplierUrl;
+  window.open(url, '_blank');
+};
+
+
 //退出登录
 const loginOut = async () => {
   filtersStore.setMemberInfo({});
@@ -175,42 +186,48 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
 .header_wrap {
   width: 100%;
   height: 33px;
-  background: #f7f7f7;
+  background-color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
 
   .header {
-    width: 1210px;
+    width: 100%;
     height: 33px;
     display: flex;
-    justify-content: space-between;
+    justify-content: space-around;
     align-items: center;
 
     .header_left {
       height: 100%;
-      font-size: 13px;
-      color: #333;
+      font-weight: bold;
+      font-size: 16px;
+      color: #282E30;
       line-height: 36px;
       display: flex;
 
       .hello {
         margin-right: 20px;
-        color: #333;
+       
       }
 
       .h1 {
         margin: 0 5px;
+        padding: 5px 10px;
         cursor: pointer;
 
         &:hover {
-          color: $colorMain;
+          background: $colorMain;
+          color: #fff;
         }
       }
     }
 
     .header_right {
       height: 100%;
+      font-weight: 400;
+      font-size: 16px;
+      color: #282E30;
 
       ul {
         width: 100%;
@@ -236,8 +253,9 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
           .li_item {
             position: relative;
             cursor: pointer;
-            font-size: 13px;
-            color: #333;
+            font-weight: 400;
+            font-size: 16px;
+            color: #282E30;
 
             &:hover {
               color: $colorMain;

+ 29 - 57
xinkeaboard-web/components/SldDiy.vue

@@ -16,13 +16,10 @@
         </el-carousel-item>
       </el-carousel>
       <div class="home-slider" v-if="item.json_data && item.json_data.type == 'main_banner_pc'">
-        <div class="s1">
-          <CategorySortTop/>
-        </div>
         <div class="s2">
           <el-carousel
                   v-if="item.json_data && item.json_data.type == 'main_banner_pc'"
-                  height="306px"
+                  height="100%"
                   arrow="never"
           >
             <el-carousel-item
@@ -35,54 +32,9 @@
               </a>
             </el-carousel-item>
           </el-carousel>
-        </div>
-
-        <div class="s3">
-          <a href="javascript:void(0)" @click="diyNavTo(item.json_data.info.left)">
-            <p class="title" >
-              {{ item.json_data.info.left.title.initialValue }}
-            </p>
-          </a>
-
-          <p class="link" v-if="!filtersStore.getLoginFlag">
-            <nuxt-link to="/login">
-              <span>{{L['登录']}}</span>
-            </nuxt-link>
-          </p>
-
-          <p class="link" v-if="!filtersStore.getLoginFlag">
-            <nuxt-link to="/register">
-              <span>{{L['注册']}}</span>
-            </nuxt-link>
-          </p>
-
-          <p class="link" @click="loginOut" v-if="filtersStore.getLoginFlag">
-              <a >{{L['退出']}}</a>
-          </p>
-
-<!--          <p class="link">-->
-<!--            <nuxt-link to="/home/contact">-->
-<!--              <span>{{L['发布需求']}}</span>-->
-<!--            </nuxt-link>-->
-<!--          </p>-->
-
-          <p class="link" @click="goSupplierUrl">
-<!--            <nuxt-link to="http://seller.b2b.test.advichcloud.com/user/login">-->
-              <a>{{L['供应商']}}</a>
-<!--            </nuxt-link>-->
-          </p>
-
-          <a href="javascript:void(0)" v-for="(val, key) in item.json_data.info.right"
-             :key="key"
-             @click="diyNavTo(val)">
-            <p class="desc">
-              {{ quillEscapeToHtml(val.title.initialValue) }}
-            </p>
-          </a>
+          <div class="home-slider-bottom"></div>
         </div>
       </div>
-
-
       <!-- adv_01 start-->
       <div
         class="adv_01_wrap"
@@ -181,17 +133,17 @@
       >
         <div class="floor_title">
           <h2>
-            <font
+            <!-- <font
               v-bind:style="{ backgroundColor: item.json_data.title_info.title_color }"
               >&nbsp;</font
-            >
-            <span v-bind:style="{ color: item.json_data.title_info.title_color }">{{
+            > -->
+            <span v-bind:style="{ color: item.json_data.title_info.title_color, fontWeight: 'bold' }">{{
               item.json_data.title_info.title_name
             }}</span>
-            <font
+            <!-- <font
               v-bind:style="{ backgroundColor: item.json_data.title_info.title_color }"
               >&nbsp;</font
-            >
+            > -->
           </h2>
         </div>
         <div class="floor_goods">
@@ -1391,15 +1343,25 @@ onMounted(() => {
 
   background: #f1f1f1;
 
+  :deep(.el-carousel__indicator) {
+    &.is-active {
+      .el-carousel__button {
+        background-color: $colorMain !important;
+      }
+    }
+  }
+
   .el-carousel__item {
+    width: 100%;
+    height: 100%;
     display: flex;
     justify-content: center;
     align-items: center;
 
     div {
       background-position: center center;
-      width: 1920px;
-      height: 457px;
+      width: 100%;
+      height: 100%;
       position: absolute;
       left: 50%;
       top: 0;
@@ -1407,6 +1369,16 @@ onMounted(() => {
       background-repeat: no-repeat;
       background-size: contain;
     }
+
+    a {
+        width: 100%;
+        height: 100%;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
   }
 
   .main_banner {

+ 26 - 17
xinkeaboard-web/components/SldHomeTopSearch.vue

@@ -23,7 +23,7 @@
           />
           <input type="submit" :value="L['搜索']" class="button" @click="search" />
         </div>
-        <div class="hot_search_wrap">
+        <!-- <div class="hot_search_wrap">
           <div>
             <template v-for="(item, index) in hotList.data" :key="index">
               <a
@@ -34,7 +34,7 @@
               >
             </template>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="search_association" id="searchA" v-show="SAList.length && SAShow">
         <div
@@ -233,14 +233,16 @@ a:visited {
   height: 80px;
     position: relative;
     z-index: 12;
-    width: 1210px;
+    width: 100%;
     margin: 0 auto 0px;
     padding-left: 0px;
     padding-right: 0px;
     display: flex;
     align-items: center;
+    justify-content: space-around;
     border-bottom: 1px solid #dbdbdb;
     margin-bottom: 10px;
+    background: #F6F8FA;
   .container_header {
     width: 100%;
     position: fixed;
@@ -314,20 +316,20 @@ a:visited {
   .sld_home_top_search_left {
     height: 100%;
     position: relative;
-    flex:0 0 250px;
+    flex:0 0 200px;
 
     .sld_logo_wrap {
       height: 100%;
 
       img {
-        max-width: 144px;
-        max-height: 100%;
+        width: 100%;
+        // height: 100%;
       }
     }
   }
 
   .sld_seach_wrap {
-    flex: auto;
+    width: 536px;
     padding-top: 4px;
     position: relative;
 
@@ -366,34 +368,34 @@ a:visited {
         }
 
         input::placeholder {
-          font-size: 12px;
+          font-size: 14px;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
-          color: rgb(153, 153, 153);
+          color: rgba(40,46,48,0.6);
         }
 
         ::-webkit-input-placeholder {
           margin-left: 20px;
-          font-size: 12px;
+          font-size: 14px;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
-          color: rgb(153, 153, 153);
+          color: rgba(40,46,48,0.6);
         }
 
         /* 使用webkit内核的浏览器 */
         :-moz-placeholder {
-          font-size: 12px;
+          font-size: 14px;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
-          color: rgb(153, 153, 153);
+          color: rgba(40,46,48,0.6);
         }
 
         /* Firefox版本19+ */
         :-ms-input-placeholder {
-          font-size: 12px;
+          font-size: 14px;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
-          color: rgb(153, 153, 153);
+          color: rgba(40,46,48,0.6);
         }
 
         /* IE浏览器 */
@@ -488,7 +490,7 @@ a:visited {
   position: relative;
   z-index: 99;
   height: 40px;
-  flex: 0 0 240px;
+  flex: 0 0 210px;
   text-align: center;
 
   dl {
@@ -521,15 +523,22 @@ a:visited {
       img {
         margin: -2px 11px 0 0px;
         vertical-align: middle;
-        width: 16px;
+        width: 20px;
       }
 
       &.cart_icon_text_wrap {
+        background-color: #fff;
         a {
           color: #666666;
           font-size: 15px;
           line-height: 36px;
         }
+
+        span {
+          font-weight: bold;
+          font-size: 16px;
+          color: $colorMain;
+        }
       }
     }
 

+ 1 - 1
xinkeaboard-web/components/Store/HeaderCat.vue

@@ -78,7 +78,7 @@
           >
             <span class="iconfont "><img src="/email.svg" /></span>
 
-              <router-link target="_blank"  :to="'/store/contact/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >
+            <router-link target="_blank"  :to="'/store/contact/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >
               {{ L["发布需求"] }}
             </router-link>
             <!-- 没有商品显示0 -->

+ 0 - 1
xinkeaboard-web/layouts/default.vue

@@ -7,7 +7,6 @@
                 </div>
             </div>
         </div>
-        <NavTopBar/>
         <slot/>
         <FooterBottom/>
     </div>

+ 2 - 1
xinkeaboard-web/pages/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
+    <NavTopBar/>
     <SldHomeTopSearch />
     <NavCatHeader />
-    <div class="bottom_line"></div>
+    <!-- <div class="bottom_line"></div> -->
     <Home></Home>
     <OpenScreen
       @closeScreen="closeScreen"

+ 2 - 13
xinkeaboard-web/public/email.svg

@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00985E;}
-</style>
-<g>
-	<path class="st0" d="M26.7,2H3.3c0,0-0.1,0-0.1,0C1.5,2,0,3.5,0,5.3v19.3C0,26.5,1.5,28,3.3,28h13.1v-2.3H3.3c-0.6,0-1-0.5-1-1v-19
-		L14,16.3l1,1l0.7-0.7l0,0L27.7,5.7v10.6H30v-11C30,3.5,28.5,2,26.7,2z M25.7,4.3L15,14.1L4.3,4.3h0h0.3H25.7z"/>
-	<polygon class="st0" points="26.6,18.9 24.7,20.3 26.1,22 16.6,22 16.6,24.3 25.9,24.3 24.7,25.9 26.6,27.3 29.9,23.1 29.9,23.1 
-		29.9,23.1 	"/>
-</g>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.6573 11.6357C15.9044 11.3948 16.3001 11.3998 16.5411 11.6467L18.5724 13.7305C18.8091 13.9732 18.8091 14.3605 18.5724 14.6033L16.5411 16.6864C16.3002 16.9334 15.9045 16.9383 15.6573 16.6974C15.4103 16.4564 15.4054 16.0607 15.6464 15.8136L16.6425 14.7919H12.4377C12.0926 14.7919 11.8129 14.512 11.8127 14.1669C11.8127 13.8217 12.0926 13.5419 12.4377 13.5419H16.6431L15.6464 12.5195L15.6042 12.4719C15.4069 12.2239 15.4255 11.8617 15.6573 11.6357ZM10 9.21143L16.2872 4.375H3.71277L10 9.21143ZM18.75 10C18.75 10.3452 18.4702 10.625 18.125 10.625C17.7798 10.625 17.5 10.3452 17.5 10V5.01892L10.3809 10.4956C10.1563 10.6682 9.8437 10.6682 9.61914 10.4956L2.5 5.01892V15.625H10C10.3452 15.625 10.625 15.9048 10.625 16.25C10.625 16.5952 10.3452 16.875 10 16.875H1.875C1.52982 16.875 1.25 16.5952 1.25 16.25V3.75C1.25 3.40482 1.52982 3.125 1.875 3.125H18.125C18.4702 3.125 18.75 3.40482 18.75 3.75V10Z" fill="#036EB8"/>
 </svg>