fix: 调整导航栏对齐样式

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

@@ -5,8 +5,8 @@
   .container {
     display: flex;
     align-items: center;
-    width: 100%;
-    padding: 0 240px;
+    width: 1210px;
+    margin: 0 auto;
     height: 80px;
     position: relative;
     z-index: 12;

xinkeaboard-web/components/MemberTop.vue

@@ -116,13 +116,14 @@ watchEffect(() => {
 <style lang="scss" scoped>
 
 .sld_member_top {
+  width: 100%;
+  background: #F6F8FA;
   .sld_member_top_zoom {
-    width: 100%;
-    background: #F6F8FA;
+    width: 1210px;
+    margin: 0 auto;
 
     .container {
       width: 100%;
-      padding: 0 240px;
       display: flex;
       align-items: center;
 

xinkeaboard-web/components/NavCatHeader.vue

@@ -158,11 +158,11 @@ onMounted(() => {
   display: flex;
   align-items: center;
   width: 100%;
-  padding: 0 240px;
 }
 .header {
-  width: 100%;
+  width: 1210px;
   height: 45px;
+  margin: 0 auto;
   display: flex;
   justify-content: center;
   overflow: visible;
@@ -170,14 +170,12 @@ onMounted(() => {
   .product_sort {
     position: relative;
     overflow: visible;
-    width: 230px;
+    width: max-content;
     height: 100%;
-    // background: #fff;
     letter-spacing: 0px;
     line-height: 45px;
     display: flex;
     align-items: center;
-    // flex-wrap: wrap;
     cursor: pointer;
     box-sizing: border-box;
     z-index:888;
@@ -187,7 +185,7 @@ onMounted(() => {
       color: #282E30;
       width: 100%;
       height: 100%;
-      padding-left: 20px;
+      // padding: 0 20px;
     }
 
     .category_sort {
@@ -228,7 +226,7 @@ onMounted(() => {
       font-weight: bold;
       font-size: $fontE;
       color: #282E30;
-      margin: 0 0 0 10px;
+      margin: 0 0 0 15px;
       line-height: 45px;
       padding: 0 3px;
       width: max-content;

xinkeaboard-web/components/NavTopBar.vue

@@ -186,18 +186,17 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
 
 .header_wrap {
   width: 100%;
-  height: 33px;
+  height: 38px;
   background-color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
   // padding-bottom: 10px;
-  padding: 10px 240px;
   // padding-top: 10px;
   border-bottom: 1px solid #dbdbdb;
 
   .header {
-    width: 100%;
+    width: 1210px;
     height: 33px;
     display: flex;
     align-items: center;
@@ -228,7 +227,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
         text-overflow: ellipsis;
         overflow: hidden;
         margin-right: 20px;
-        padding-left: 20px;
+        // padding-left: 20px;
       }
 
       .h1 {

xinkeaboard-web/components/SldHomeTopSearch.vue

@@ -1,6 +1,6 @@
 <template>
-
-    <div class="sld_home_top_search container">
+    <div class="sld_home_top">
+      <div class="sld_home_top_search container">
     <div class="ld sld_home_top_search_left">
       <a href="javascript:void(0)" class="sld_logo_wrap flex_row_start_center" @click="go_home">
         <img :src="filtersStore.getSiteLogo" />
@@ -100,6 +100,8 @@
       </dl>
     </div>
   </div>
+    </div>
+    
 
 
 
@@ -229,19 +231,20 @@ a:visited {
   color: #333;
 }
 
+.sld_home_top {
+  width: 100%;
+  background: #F6F8FA;
+  border-bottom: 1px solid #dbdbdb;
+}
+
 .sld_home_top_search {
     height: 80px;
     position: relative;
     z-index: 12;
-    width: 100%;
-    // margin: 0 auto 0px;
-    padding: 0 240px;
+    width: 1210px;
+    margin: 0 auto;
     display: flex;
     align-items: center;
-    // justify-content: center;
-    border-bottom: 1px solid #dbdbdb;
-    // margin-bottom: 10px;
-    background: #F6F8FA;
   .container_header {
     width: 100%;
     position: fixed;
@@ -324,7 +327,8 @@ a:visited {
 
       img {
         width: 100%;
-        // height: 100%;
+        height: 100%;
+        object-fit: cover;
       }
     }
   }

xinkeaboard-web/pages/store/contact/[contact].vue

@@ -54,12 +54,26 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item :label="L['邮箱']" prop="email">
-                  <el-input
-                    v-model="form.email"
-                    :placeholder="L['请输入邮箱']"
-                  />
-                </el-form-item>
+                <el-form-item
+                    v-if="contactType === 'email'"
+                    :label="L['邮箱']"
+                    prop="email"
+                  >
+                    <el-input
+                      v-model="form.email"
+                      :placeholder="L['请输入邮箱']"
+                    />
+                  </el-form-item>
+                  <el-form-item
+                    v-if="contactType === 'mobile'"
+                    :label="L['电话']"
+                    prop="phone"
+                  >
+                    <el-input
+                      v-model="form.phone"
+                      :placeholder="L['请输入手机号']"
+                    />
+                  </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item :label="L['电话代码']" prop="phoneCode">
@@ -76,12 +90,26 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item :label="L['电话']" prop="phone">
-                  <el-input
-                    v-model="form.phone"
-                    :placeholder="L['请输入电话']"
-                  />
-                </el-form-item>
+                <el-form-item
+                    v-if="contactType === 'mobile'"
+                    :label="L['邮箱']"
+                    prop="email"
+                  >
+                    <el-input
+                      v-model="form.email"
+                      :placeholder="L['请输入邮箱']"
+                    />
+                  </el-form-item>
+                  <el-form-item
+                    v-if="contactType === 'email'"
+                    :label="L['电话']"
+                    prop="phone"
+                  >
+                    <el-input
+                      v-model="form.phone"
+                      :placeholder="L['请输入电话']"
+                    />
+                  </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item :label="L['公司名称']" prop="company">
@@ -153,6 +181,7 @@ import {
 import { useFiltersStore } from "@/store/filter.js";
 import { GoogleMap, Marker } from 'vue3-google-map'
 import { getCurLanguage } from '@/composables/common.js';
+import { getContactType } from "@/utils/common";
 
 const L = getCurLanguage();
 const center = reactive({data:{ lat: 0, lng: 0 }})
@@ -176,6 +205,7 @@ const form = reactive({
 });
 const filtersStore = useFiltersStore();
 const countryPhone = ref([]);
+const contactType = getContactType();
 
 useHead({
     title: 'Store Contact Us',
@@ -205,6 +235,13 @@ const checkEmailFun = (rule, value, callback) => {
   callback();
 };
 
+const existCheckEmailFun = (rule, value, callback) => {
+  if (existCheckEmail(value) !== true) {
+    callback(new Error(existCheckEmail(value)));
+  }
+  callback();
+};
+
 const checkPhoneFun = (rule, value, callback) => {
   if (checkPhone(value) !== true) {
     callback(new Error(checkPhone(value)));
@@ -212,6 +249,13 @@ const checkPhoneFun = (rule, value, callback) => {
   callback();
 };
 
+const existCheckPhoneFun = (rule, value, callback) => {
+  if (existCheckPhone(value) !== true) {
+    callback(new Error(existCheckPhone(value)));
+  }
+  callback();
+};
+
 const closeModal = (formEl) => {
   if (!formEl) return;
   formEl.resetFields();
@@ -220,9 +264,11 @@ const closeModal = (formEl) => {
 
 const rules = reactive({
   name: [{ required: true, message: L["请输入姓名"], trigger: "blur" }],
-  email: [
-    { required: true, message: L["请输入邮箱"], trigger: "blur" },
-    { validator: checkEmailFun, trigger: "blur" },
+  email: contactType === "email" ? [
+     { required: true, message: L["请输入邮箱"], trigger: "blur" },
+     { validator: checkEmailFun, trigger: "blur" },
+  ] : [
+    { validator: existCheckEmailFun, trigger: "blur" }
   ],
   phoneCode: [
     {
@@ -231,10 +277,14 @@ const rules = reactive({
       trigger: ['blur','change'],
     },
   ],
-  // phone: [
-  //   { required: true, message: L["请输入电话"], trigger: "blur" },
-  //   // { validator: checkPhoneFun, trigger: "blur" },
-  // ],
+  phone: contactType === "mobile" ? [
+    { required: true, message: L["请输入电话"], trigger: "blur" },
+    { validator: checkPhoneFun, trigger: "blur" },
+  ] : [
+    {
+      validator: existCheckPhoneFun, trigger: "blur"
+    }
+  ],
   company: [
     {
       required: true,