fix: 全局样式调整

xinkeaboard-web/assets/language/en.js

@@ -5,7 +5,7 @@ export const lang_en = {
     //首页公共头部最顶部
     '您好，欢迎来到': 'Hello, welcome to',
     '退出': 'Sign out',
-    '注册': 'Join For Free',
+    '注册': 'Join for Free',
     '商城首页': 'Home',
     '待支付订单': 'Orders to be paid',
     '待收货订单': 'Inbound Orders',
@@ -16,7 +16,7 @@ export const lang_en = {
     '我的账户': 'My Account',
     '服务中心': 'Service Center',
     '我的询盘': 'My Enquiry',
-    '发布需求': 'Purchase Requisition',
+    '发布需求': 'Product Inquiry',
     '供应商': 'For Supplier',
     '下载中心':'Download Center',
     '暂无下载记录':'No download record',
@@ -29,12 +29,12 @@ export const lang_en = {
     '手机登录': 'login by phone',
     '账号登录': 'Account login',
     '还没注册？': 'Not registered?',
-    '去注册': 'Join For Free',
+    '去注册': 'Join for Free',
     '账号为4~16位字母、数字或下划线': 'Account number from 4 to 16 letters, digits, or underscores',
     '登录': 'Sign In',
     '请输入密码': 'Please enter your password',
-    '立即注册': 'Join For Free',
-    '忘记密码': 'Forgot password',
+    '立即注册': 'Join for Free',
+    '忘记密码': 'Forgot Password',
     '请输入账号/手机号': 'Please enter the account number / mobile phone number',
     '请输入手机号': 'Please enter phone number',
     '请输入验证码': 'Please enter verification code',
@@ -47,7 +47,8 @@ export const lang_en = {
     //忘记密码页面
     '想起密码？': 'Remember your password?',
     '去登录': 'Sign In',
-    '找回密码': 'Retrieve your password',
+    '找回密码': 'Reset Password',
+    '确认': 'Confirm',
     '我们已经发邮件到':'We have sent an email to',
     '请按照邮件中的说明重新设置密码。':'Follow the instructions in the email to reset your password.',
     '邮件可能需要几分钟才能到达。如果您没有收到，请检查您的垃圾邮件文件夹或请求另一封邮件。':'The email may take up to a few minutes to arrive. If you don\'t receive, please check your spam folder or request another email.',

xinkeaboard-web/assets/language/zh.js

@@ -52,6 +52,7 @@ export const lang_zn = {
     '想起密码？': '想起密码？',
     '去登录': '去登录',
     '找回密码': '找回密码',
+    '确认': '确认',
     '请查收': '请查收',
     '重置密码链接已发送': '重置密码链接已发送',
     '我们已经发邮件到':'我们已经发邮件到',

xinkeaboard-web/assets/style/category.scss

@@ -62,7 +62,7 @@ i {
 
 .goods_sort {
   position: relative;
-  width: 1200px;
+  width: 1440px;
   margin: 0 auto;
   min-height: 700px;
 }
@@ -91,7 +91,8 @@ i {
     }
 
     .cat_item {
-      width: 179px;
+      width: max-content;
+      padding: 0 15px;
       height: 30px;
       margin-top: 10px;
       line-height: 30px;
@@ -101,77 +102,84 @@ i {
       overflow: visible;
       background: #f5f5f5;
       cursor: pointer;
-      & > div {
-        text-align: center;
-      }
-
-      &:nth-child(9n + 1):hover,
-      &:nth-child(9n + 1).on {
-        color: #fff;
-        background: #edd557;
-        background: linear-gradient(to right, #edd557, #f0a223);
-      }
-
-      &:nth-child(9n + 2):hover,
-      &:nth-child(9n + 2).on {
-        color: #fff;
-        background: #42caab;
-        background: linear-gradient(to right, #42caab, #0c97ee);
-      }
-
-      &:nth-child(9n + 3):hover,
-      &:nth-child(9n + 3).on {
-        color: #fff;
-        background: #8fa4fc;
-        background: linear-gradient(to right, #8fa4fc, #b386ea);
-      }
-
-      &:nth-child(9n + 4):hover,
-      &:nth-child(9n + 4).on {
-        color: #fff;
-        background: #62d993;
-        background: linear-gradient(to right, #62d993, #41ae65, #0c97ee);
-      }
 
-      &:nth-child(9n + 5):hover,
-      &:nth-child(9n + 5).on {
+      &:hover,
+      &.on {
         color: #fff;
-        background: #64b1e4;
-        background: linear-gradient(to right, #64b1e4, #6876f2);
+        background: $colorMain;
       }
 
-      &:nth-child(9n + 6):hover,
-      &:nth-child(9n + 6).on {
-        color: #fff;
-        background: #f887c3;
-        background: linear-gradient(to right, #f887c3, #f12086);
-      }
-
-      &:nth-child(9n + 7):hover,
-      &:nth-child(9n + 7).on {
-        color: #fff;
-        background: #fdc237;
-        background: linear-gradient(to right, #fdc237, #ff7802);
-      }
-
-      &:nth-child(9n + 8):hover,
-      &:nth-child(9n + 8).on {
-        color: #fff;
-        background: #3dcbdd;
-        background: linear-gradient(to right, #3dcbdd, #5594e4);
+      & > div {
+        text-align: center;
       }
 
-      &:nth-child(9n):hover,
-      &:nth-child(9n).on {
-        color: #fff;
-        background: #ff787b;
-        background: linear-gradient(to right, #ff787b, #ff305c);
-      }
+      // &:nth-child(9n + 1):hover,
+      // &:nth-child(9n + 1).on {
+      //   color: #fff;
+      //   background: #edd557;
+      //   background: linear-gradient(to right, #edd557, #f0a223);
+      // }
+
+      // &:nth-child(9n + 2):hover,
+      // &:nth-child(9n + 2).on {
+      //   color: #fff;
+      //   background: #42caab;
+      //   background: linear-gradient(to right, #42caab, #0c97ee);
+      // }
+
+      // &:nth-child(9n + 3):hover,
+      // &:nth-child(9n + 3).on {
+      //   color: #fff;
+      //   background: #8fa4fc;
+      //   background: linear-gradient(to right, #8fa4fc, #b386ea);
+      // }
+
+      // &:nth-child(9n + 4):hover,
+      // &:nth-child(9n + 4).on {
+      //   color: #fff;
+      //   background: #62d993;
+      //   background: linear-gradient(to right, #62d993, #41ae65, #0c97ee);
+      // }
+
+      // &:nth-child(9n + 5):hover,
+      // &:nth-child(9n + 5).on {
+      //   color: #fff;
+      //   background: #64b1e4;
+      //   background: linear-gradient(to right, #64b1e4, #6876f2);
+      // }
+
+      // &:nth-child(9n + 6):hover,
+      // &:nth-child(9n + 6).on {
+      //   color: #fff;
+      //   background: #f887c3;
+      //   background: linear-gradient(to right, #f887c3, #f12086);
+      // }
+
+      // &:nth-child(9n + 7):hover,
+      // &:nth-child(9n + 7).on {
+      //   color: #fff;
+      //   background: #fdc237;
+      //   background: linear-gradient(to right, #fdc237, #ff7802);
+      // }
+
+      // &:nth-child(9n + 8):hover,
+      // &:nth-child(9n + 8).on {
+      //   color: #fff;
+      //   background: #3dcbdd;
+      //   background: linear-gradient(to right, #3dcbdd, #5594e4);
+      // }
+
+      // &:nth-child(9n):hover,
+      // &:nth-child(9n).on {
+      //   color: #fff;
+      //   background: #ff787b;
+      //   background: linear-gradient(to right, #ff787b, #ff305c);
+      // }
     }
   }
 
   .class_detail {
-    width: 1200px;
+    width: 100%;
     padding-left: 221px;
     z-index: 99;
 
@@ -186,6 +194,8 @@ i {
         font-weight: bold;
         padding: 2px 0 10px;
         line-height: 1;
+        color: $colorMain;
+        border-bottom: 1px solid $colorMain;
       }
 
       .cat_wrap_dd {
@@ -193,19 +203,22 @@ i {
         padding: 7px 0;
 
         .cat_dd_item {
-          min-height: 38px;
+          display: flex;
+          align-items: center;
+          // min-height: 38px;
           border-bottom: 1px dashed #dddddd;
         }
 
         .cat_left {
-          width: 200px;
-          padding-top: 10px;
+          width: max-content;
+          // padding-top: 10px;
           font-size: 12px;
           font-weight: bold;
+          color: $colorMain;
         }
 
         .cat_add_right {
-          padding-left: 106px;
+          // padding-left: 106px;
           line-height: 38px;
 
           span {

xinkeaboard-web/assets/style/decorate.scss

@@ -1030,7 +1030,7 @@
   font-size: $fontE;
   position: relative;
 
-  a {
+  .wrap-img {
     width: 100%;
     height: 100%;
     display: flex;
@@ -1091,11 +1091,11 @@
   background: #fff;
   letter-spacing: 0;
   text-align: center;
-  margin-top: 20px;
+  margin-top: 15px;
 }
 
 .adv_04_wrap .floor_goods .item .wrap .title a {
-  font-weight: bold;
+  // font-weight: bold;
   color: #282E30;
   line-height: 19px !important;
   overflow: hidden;
@@ -3705,7 +3705,7 @@ a {
 .adv_27_wrap .floor_goods .item {
   float: left;
   float: left;
-  width: 286px;
+  width: 288px;
   height: 326px;
   background-color: #fff;
   box-sizing: border-box;
@@ -3778,7 +3778,7 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title {
-  font-weight: bold;
+  // font-weight: bold;
   font-size: 14px;
   color: #282E30;
   height: 44px;
@@ -3793,7 +3793,7 @@ a {
   background: #fff;
   letter-spacing: 0;
   text-align: center;
-  margin-top: 20px;
+  margin-top: 15px;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title a {
@@ -3895,7 +3895,7 @@ a {
 }
 
 .adv_28_wrap .industry-booth .prod-txt {
-  font-weight: bold;
+  // font-weight: bold;
   font-size: $fontE;
   color: #282E30;
   line-height: 24px;
@@ -3908,7 +3908,7 @@ a {
   word-wrap: break-word;
   position: relative;
   z-index: 2;
-  margin-top: 20px;
+  margin-top: 15px;
 }
 
 .adv_28_wrap .industry-booth .prod-pic {

xinkeaboard-web/assets/style/register.scss

@@ -122,9 +122,9 @@
             display: block;
             line-height: 50px;
             margin-right: 10px;
-            font-weight: bold;
+            // font-weight: bold;
             font-size: 14px;
-            color: #999;
+            color: $colorMain;
 
             &:hover {
               color: $colorMain;

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

@@ -5,7 +5,7 @@
   .container {
     display: flex;
     align-items: center;
-    width: 1210px;
+    width: 1440px;
     margin: 0 auto;
     height: 80px;
     position: relative;
@@ -378,7 +378,7 @@
 
       .sld_store_first_cat {
         position: absolute;
-        top: 38px;
+        top: 48px;
         left: 0;
         width: 200px;
         font-size: 15px;
@@ -458,8 +458,9 @@
 
         &.sld_all_store_cat {
           position: relative;
-          width: 200px;
+          width: 168px;
           height: 100%;
+          text-align: center;
           // background-color: #ffffff;
           font-weight: 400;
           font-size: 12px;
@@ -487,11 +488,12 @@
       ul {
         display: flex;
         align-items: center;
-        width: 1210px;
+        width: 1440px;
         margin: 0 auto;
         position: relative;
 
         li {
+          width: 168px;
           height: 100%;
 
           &:hover,
@@ -509,7 +511,7 @@
         display: flex;
         align-items: center;
         position: absolute;
-        left: 200px;
+        left: 168px;
         width: 735px;
         // height: 38px;
         height: 100%;

xinkeaboard-web/assets/style/storeList.scss

@@ -45,7 +45,7 @@
 }
 
 .sld_store_list {
-    width: 1210px;
+    width: 1440px;
     margin: 0 auto;
     padding-left: 0px;
     padding-right: 0px;
@@ -120,15 +120,18 @@
     }
 
     .sld_store_item {
-        width: 25%;
-        margin-top: 30px;
+        width: 360px;
+        height: 388px;
         background-color: #fff;
-        height: 250px;
         display: flex;
         justify-content: center;
         align-items: flex-start;
         border-bottom: 1px solid #dedede;
-        //border: 1px solid #eeeeee;
+        border: 1px solid #eeeeee;
+
+        // &:nth-of-type(n + 4) {
+        //     border-right: none;
+        // }
         &.skeleton_sld_store_item {
             .sld_vendor_logo {
                 background: $colorSkeleton;
@@ -153,22 +156,21 @@
             height: 228px;
         }
         .sld_vendor {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            height: 100%;
             position: relative;
             box-sizing: border-box;
             //border-right: 1px solid #eee;
             .sld_vendor_logo {
-                height: 114px;
-                margin: 0 auto;
-                width: auto;
-                text-align: center;
-                display: flex;
-                justify-content: center;
-                align-items: center;
+                width: 232px;
+                height: 232px;
                 img {
-                    width: auto;
-                    display: block;
-                    margin: 0 auto;
-                    max-width: 150px;
+                    width: 100%;
+                    height: 100%;
                 }
             }
             .sld_vendor_name {
@@ -187,24 +189,35 @@
                 }
             }
             .sld_vendor_bottom {
-
+                position: absolute;
+                bottom: 0;
+                width: 100%;
+                height: 46px;
+                background-color: #DDE1E6;
                 text-align: center;
+                cursor: pointer;
+
+                &:hover {
+                    background-color: $colorMain;
+
+                    a {
+                         color: #fff;
+                    }
+                }
 
                 a {
-                    width: 100%;
-                    height: 46px;
-                    text-align: center;
-                    line-height: 46px;
-                    color: #444444;
+                    font-weight: 400;
                     font-size: 14px;
-                    &:hover {
-                        color: $colorMain;
-                    }
+                    color: #282E30;
+                    line-height: 46px;
+                    // &:hover {
+                    //     color: #fff;
+                    // }
                 }
                 a i {
                     font-size: 14px;
                     color: $colorMain;
-                    margin-right: 6px;
+                    // margin-right: 6px;
                 }
             }
         }

xinkeaboard-web/components/CategorySortTop.vue

@@ -255,19 +255,20 @@ const toGoodsList = (item) => {
 
       .children {
         display: none;
-        width: 1013px;
+        width: max-content;
         height: 306px;
         background-color: #fff;
         position: absolute;
         top: 0;
         left: 230px;
-        padding: 10px 0;
+        padding-right: 10px;
         overflow: hidden;
         box-shadow: 0px 5px 10px 0px rgba(153, 153, 153, 0.15);
         .fore_dl {
           width: 100%;
           clear: both;
           overflow: hidden;
+          font-size: 14px !important;
         }
 
         dt {

xinkeaboard-web/components/FooterBottom.vue

@@ -138,12 +138,12 @@ getCopyrightData();
   .link_box {
     border-top: 1px dashed #f2f2f2;
     padding-top: 50px;
-    width: 100%;
-    margin: 0 auto 50px;
+    width: 1440px;
+    margin: 0 auto;
     display: flex;
     position: relative;
     // flex-direction: row;
-    justify-content: space-around;
+    justify-content: space-between;
 
     .link_wrap {
       text-align: left;

xinkeaboard-web/components/NavCatHeader.vue

@@ -11,9 +11,9 @@
         </div>
       </div>
       <nav>
-        <li v-if="showIndex">
+        <!-- <li v-if="showIndex">
           <nuxt-link to="/" target="_blank">{{L['首页']}}</nuxt-link>
-        </li>
+        </li> -->
         <li v-for="(item, index) in navList.data" :key="index">
           <a @click="(e) => navClick(e, item)" :class="{'active': getActive(item)}">{{
             item.navName

xinkeaboard-web/components/SldDiy.vue

@@ -154,6 +154,7 @@
           >
             <div class="wrap">
               <router-link
+                  class="wrap-img"
                   target="_blank"
                   :to="'/goods/detail/'+ calcProductName(item_main.goodsName) +'_'+ item_main.productId"
               >
@@ -1128,15 +1129,15 @@
           </div>
           <div class="sourcing-text">
             <div class="sourcing-title" @click="diyNavTo(item.json_data.title_info)">{{item.json_data.title_info.title.initialValue}}</div>
-            <div class="sourcing-desc-warp">
-              <div class="sourcing-desc" style="margin-bottom: 24px" @click="diyNavTo(item.json_data.title_info)">
+            <div class="sourcing-desc" style="margin-bottom: 24px" @click="diyNavTo(item.json_data.title_info)">
                 <p>{{item.json_data.title_info.sub_title.initialValue}}</p>
               </div>
-            <div class="sourcing-desc" v-for="(item_center, index_center) in item.json_data.center" v-bind:key="index_center" >
-              <p @click="diyNavTo(item_center)">
-                {{ item_center.title.initialValue }}
-              </p>
-            </div>
+            <div class="sourcing-desc-warp">
+                <div class="sourcing-desc" v-for="(item_center, index_center) in item.json_data.center" v-bind:key="index_center" >
+                  <p @click="diyNavTo(item_center)">
+                    {{ item_center.title.initialValue }}
+                  </p>
+                </div>
             </div>
             <div class="sourcing-more">
               <a href="javascript:void(0)" @click="diyNavTo(item.json_data.btn)">

xinkeaboard-web/components/Store/HeaderCat.vue

@@ -89,6 +89,8 @@
         </dl>
       </div>
     </div>
+        <NavTopBar></NavTopBar>
+
     <div class="sld_store_label_nav_wrap">
       <div class="sld_store_label_wrap">
         <img
@@ -135,11 +137,11 @@
             </ul>
           </li>
           <ul class="sld_store_cat_horizontal" v-if="storeData.info.storeName">
-            <li :class="{ 'active': routePath === '/store/'+ calcProductName(storeData.info.storeName) +'_'+ vid }">
+            <!-- <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> -->
             <li :class="{'active': routePath === '/store/goods/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid}">
               <nuxt-link :to="'/store/goods/'+ calcProductName(storeData.info.storeName) +'_v-'+ vid" >{{
                 L["所有商品"]

xinkeaboard-web/components/StoreItem.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="sld_vendor_bottom">
         <router-link :to="'/store/'+ calcProductName(item.storeName) +'_'+ item.storeId" target="_blank"
-          ><i class="iconfont">&#xe654;</i>{{L['进入店铺']}}</router-link
+          >{{L['进入店铺']}}</router-link
         >
       </div>
     </div>

xinkeaboard-web/components/retrieve/RetrievePassword.vue

@@ -129,7 +129,7 @@
       :class="{ submit: true, disabled: forgetPwdDisabled }"
       :disabled="forgetPwdDisabled"
       :loading="forgetPwdLoading"
-      >{{ L["找回密码"] }}</el-button
+      >{{ L["确认"] }}</el-button
     >
     <el-dialog
       :title="L['register']['滑动验证']"
@@ -459,8 +459,8 @@ watch(emailCode, (val) => {
       .el-button {
         width: 100%;
         height: 100%;
-        color: #666;
-        background: #f8f8f8;
+        color: #fff;
+        background: $colorMain;
         border-left: none;
         border-radius: 0;
         font-size: 12px;

xinkeaboard-web/components/retrieve/RetrievePwdByPhone.vue

@@ -129,7 +129,7 @@
       :class="{ submit: true, disabled: forgetPwdDisabled }"
       :disabled="forgetPwdDisabled"
       :loading="forgetPwdLoading"
-      >{{ L["找回密码"] }}</el-button
+      >{{ L["确认"] }}</el-button
     >
     <el-dialog
       :title="L['register']['滑动验证']"
@@ -459,8 +459,8 @@ watch(mobileCode, (val) => {
       .el-button {
         width: 100%;
         height: 100%;
-        color: #666;
-        background: #f8f8f8;
+        color: #fff;
+        background: $colorMain;
         border-left: none;
         border-radius: 0;
         font-size: 12px;

xinkeaboard-web/public/language/en.js

@@ -25,7 +25,7 @@ export const lang_en = {
     '登录': 'log in',
     '请输入密码': 'Please enter your password',
     '立即注册': 'Sign up now',
-    '忘记密码': 'Forgot password',
+    '忘记密码': 'Forgot Password',
     '请输入账号/手机号': 'Please enter the account number / mobile phone number',
     '请输入手机号': 'Please enter phone number',
     '请输入验证码': 'please enter verification code',