浏览代码

fix: 修复门户网站相关问题

周玉环 11 小时之前
父节点
当前提交
762dfb9581

+ 2 - 2
xinkeaboard-web/app.vue

@@ -50,7 +50,7 @@ provide(ID_INJECTION_KEY, {
 
 const googleTranslateInit = () => {
   let checkIfGoogleLoaded = setInterval(() => {
-    if (google?.translate?.TranslateElement != null) {
+    if (window.google && window.google.translate?.TranslateElement != null) {
         clearInterval(checkIfGoogleLoaded);
       googleTranslateElement('google_translate_element');
     }
@@ -58,7 +58,7 @@ const googleTranslateInit = () => {
 }
 
 const googleTranslateElement = (id) => {
-  new google.translate.TranslateElement({pageLanguage: 'en',layout: google.translate.TranslateElement.InlineLayout.SIMPLE}, id);
+  new window.google.translate.TranslateElement({pageLanguage: 'en',layout: google.translate.TranslateElement.InlineLayout.SIMPLE}, id);
 
 }
 

+ 18 - 8
xinkeaboard-web/assets/style/decorate.scss

@@ -25,7 +25,8 @@
   align-items: center;
   justify-content: center;
   a {
-    width: 1210px;
+    width: 100%;
+    padding: 0 24px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -1015,7 +1016,7 @@
   width: 172px;
   text-align: center;
   margin: 0 auto;
-  font-size: 14px;
+  font-size: $fontE;
   position: relative;
 }
 
@@ -1073,7 +1074,6 @@
 
 .adv_04_wrap .floor_goods .item .wrap .title a {
   font-weight: bold;
-  font-size: 16px;
   color: #282E30;
   line-height: 19px !important;
   overflow: hidden;
@@ -3846,7 +3846,7 @@ a {
 
 .adv_28_wrap .industry-booth .prod-txt {
   font-weight: bold;
-  font-size: 16px;
+  font-size: $fontE;
   color: #282E30;
   line-height: 24px;
   height: 48px;
@@ -4094,6 +4094,7 @@ a {
     background: #fff;
     margin-left: 225px;
     width: 530px;
+    height: 410px;
     .form-title {
       font-size: 24px;
       line-height: 30px;
@@ -4102,8 +4103,11 @@ a {
     }
   }
   .sourcing-text {
-    padding-top: 20px;
-    padding-left: 30px;
+    position: absolute;
+    left: 20px;
+    top: 0px;
+    height: 410px;
+    width: 350px;
     overflow: hidden;
   }
   .sourcing-title {
@@ -4113,16 +4117,22 @@ a {
     margin-bottom: 20px;
     transform-origin: left;
   }
+  .sourcing-desc-warp {
+    position: absolute;
+    bottom: 80px;
+  }
   .sourcing-desc {
     font-weight: 400;
-    font-size: 16px;
+    font-size: $fontE;
     color: #FFFFFF;
     p {
       // margin-bottom: 8px;
     }
   }
   .sourcing-more {
-    margin-top: 45px;
+    // margin-top: 45px;
+    position: absolute;
+    bottom: 0;
     
     a {
        font-weight: bold;

+ 8 - 9
xinkeaboard-web/assets/style/member/collect.scss

@@ -85,7 +85,7 @@ i {
                     transition: all 0.5s;
                     margin-left: 15px;
                     font-weight: bold;
-                    font-size: 16px;
+                    font-size: $fontE;
                     color: #282E30;
 
                     &:hover {
@@ -106,7 +106,7 @@ i {
                     padding: 5px 20px 5px;
                     margin-left: 20px;
                     font-weight: 400;
-                    font-size: 16px;
+                    font-size: $fontE;
                     color: #282E30;
                     // margin-top: 13px;
                     // margin-right: 10px;
@@ -127,8 +127,8 @@ i {
             }
 
             .sld_grade_nav {
-                height: 52px;
-                line-height: 52px;
+                height: 50px;
+                line-height: 50px;
                 margin-left: -1px;
 
                 a {
@@ -136,7 +136,7 @@ i {
                     width: 178px;
                     text-align: center;
                     font-weight: bold;
-                    font-size: 16px;
+                    font-size: $fontE;
                     color: #282E30;
                     cursor: pointer;
                     border-right: 1px solid #eeeeee;
@@ -148,7 +148,6 @@ i {
 
                 a.on {
                     color: #fff;
-                    height: 53px;
                     background-color: $colorMain;
                     font-weight: 600;
                 }
@@ -318,7 +317,7 @@ i {
                         height: 42px;
                         text-align: center;
                         font-weight: 400;
-                        font-size: 16px;
+                        font-size: $fontE;
                         color: #282E30;
                         line-height: 42px;
                         box-sizing: border-box;
@@ -541,7 +540,7 @@ i {
                         overflow: hidden;
 
                         .goods_price {
-                            font-size: 16px;
+                            font-size: $fontE;
                             color: $colorMain;
                             margin-top: 3px;
                             font-weight: 600;
@@ -579,7 +578,7 @@ i {
                                 top: 45px;
                                 width: 32px;
                                 height: 70px;
-                                font-size: 16px;
+                                font-size: $fontE;
                                 color: #fff;
                                 background-color: #8d8b8b;
                                 text-align: center;

+ 4 - 4
xinkeaboard-web/assets/style/member/footprint.scss

@@ -28,14 +28,14 @@ a:visited {
         position: relative;
     }
     .log_option {
-        width: 160px;
-        height: 44px;
+        width: 140px;
+        height: 40px;
         background: #DDE1E6;
         position: absolute;
         right: 30px;
-        top: 0px;
+        top: 2px;
         font-weight: 400;
-        font-size: 16px;
+        font-size: $fontE;
         color: #282E30;
         padding: 5px 15px 5px;
         border: 1px solid #cccccc;

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

@@ -94,7 +94,7 @@
             flex: 1;
             text-align: center;
             font-weight: bold;
-            font-size: 32px;
+            font-size: 27px;
             color: #282E30;
             position: relative;
             cursor: default;

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

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

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

@@ -424,7 +424,7 @@ watchEffect(() => {
 
         a {
           font-weight: bold;
-          font-size: 16px;
+          font-size: $fontE;
           color: $colorMain;
         }
       }

+ 2 - 2
xinkeaboard-web/components/NavCatHeader.vue

@@ -182,7 +182,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
     z-index:888;
     a{
       font-weight: bold;
-      font-size: 14px;
+      font-size: $fontE;
       color: #282E30;
     }
 
@@ -221,7 +221,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
       font-weight: bold;
-      font-size: 14px;
+      font-size: $fontE;
       color: #282E30;
       margin: 0 0 0 10px;
       line-height: 45px;

+ 7 - 5
xinkeaboard-web/components/SldDiy.vue

@@ -1059,7 +1059,7 @@
       >
         <div class="section-block industry-booth w_sld_react_1210 ">
           <div class="industry-banner">
-            <a class="industry-link" href="javascript:void(0)">
+            <div class="industry-link">
               <div class="industry-theme-image">
                 <img class="theme-img-big" v-bind:src="item.json_data.left.data.imgUrl" @click="diyNavTo(item.json_data.left.data)"/>
               </div>
@@ -1074,7 +1074,7 @@
                   }}</span>
                 </div>
               </div>
-            </a>
+            </div>
           </div>
           <div class="industry-products">
             <div class="prod-item" v-for="(item_center_bottom, index_center_bottom) in item.json_data
@@ -1130,14 +1130,16 @@
           </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" 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-warp">
+              <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>
             <div class="sourcing-more">
               <a href="javascript:void(0)" @click="diyNavTo(item.json_data.btn)">
                 {{item.json_data.btn.title.initialValue}}<i class="ob-icon icon-right"> ></i>

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

@@ -368,7 +368,7 @@ a:visited {
         }
 
         input::placeholder {
-          font-size: 14px;
+          font-size: $fontE;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
           color: rgba(40,46,48,0.6);
@@ -376,7 +376,7 @@ a:visited {
 
         ::-webkit-input-placeholder {
           margin-left: 20px;
-          font-size: 14px;
+          font-size: $fontE;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
           color: rgba(40,46,48,0.6);
@@ -384,7 +384,7 @@ a:visited {
 
         /* 使用webkit内核的浏览器 */
         :-moz-placeholder {
-          font-size: 14px;
+          font-size: $fontE;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
           color: rgba(40,46,48,0.6);
@@ -392,7 +392,7 @@ a:visited {
 
         /* Firefox版本19+ */
         :-ms-input-placeholder {
-          font-size: 14px;
+          font-size: $fontE;
           /*font-family: Microsoft YaHei;*/
           font-weight: 400;
           color: rgba(40,46,48,0.6);
@@ -403,7 +403,7 @@ a:visited {
         .button {
           width: 103px;
           background: $colorMain;
-          font-size: 14px;
+          font-size: $fontE;
           font-weight: 600;
           color: #fff;
           float: right;
@@ -536,7 +536,7 @@ a:visited {
 
         span {
           font-weight: bold;
-          font-size: 14px;
+          font-size: $fontE;
           color: $colorMain;
         }
       }

+ 1 - 1
xinkeaboard-web/components/register/RegisterAccount.vue

@@ -315,7 +315,7 @@ watch(name, (val) => {
   .error {
     margin-top: 10px;
     position: relative;
-    color: $colorMain;
+    color: #e2231a;
     height: 16px;
     line-height: 16px;
   }

+ 13 - 13
xinkeaboard-web/components/register/RegisterMail.vue

@@ -256,27 +256,27 @@ const clearInputVal = (type) => {
 
     input::placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     ::-webkit-input-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* 使用webkit内核的浏览器 */
     :-moz-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* Firefox版本19+ */
     :-ms-input-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
@@ -326,47 +326,47 @@ const clearInputVal = (type) => {
     :before {
       position: absolute;
       top: 9px;
-      left: 14px;
+      left: -5px;
     }
   }
 
   .error {
     margin-top: 10px;
     position: relative;
-    color: $colorMain;
+    color: #e2231a;
     height: 16px;
     line-height: 16px;
   }
 
   .verify-code {
     display: flex;
-    width: 326px;
+    width: 350px;
     height: 40px;
     margin-top: 10px;
 
     input::placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     ::-webkit-input-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* 使用webkit内核的浏览器 */
     :-moz-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* Firefox版本19+ */
     :-ms-input-placeholder {
       font-weight: 400;
-      font-size: 12px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
@@ -390,7 +390,7 @@ const clearInputVal = (type) => {
       border-right: none;
       height: 40px;
       padding: 0 0 0 10px;
-      width: 190px;
+      width: 200px;
     }
 
     &-accept {
@@ -407,7 +407,7 @@ const clearInputVal = (type) => {
         background: $colorMain;
         border-left: none;
         border-radius: 0;
-        font-size: 12px;
+        font-size: $fontE;
 
         &:hover {
           // border-color: #e8e8e8;

+ 1 - 1
xinkeaboard-web/components/register/RegisterPhone.vue

@@ -306,7 +306,7 @@ const clearInputVal = (type) => {
   .error {
     margin-top: 10px;
     position: relative;
-    color: $colorMain;
+    color: #e2231a;
     height: 16px;
     line-height: 16px;
   }

+ 1 - 0
xinkeaboard-web/nuxt.config.ts

@@ -62,6 +62,7 @@ export default defineNuxtConfig({
     server: {
       proxy: {
         "/api": {
+          // target: 'http://54.46.9.88:8001/',
           target: "http://xinke-alb-1217859923.ap-southeast-1.elb.amazonaws.com:18001",
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, ""),

+ 6 - 6
xinkeaboard-web/pages/login.vue

@@ -26,7 +26,7 @@
     <div class="sld_login_content">
       <img
         class="bg"
-        :src="ImgBG ? ImgBG : configInfo.main_user_logon_bg + ''"
+        :src="ImgBG"
         :onerror="defaultBgImg"
         alt
       />
@@ -215,27 +215,27 @@ onMounted(() => {
 
     input::placeholder {
       font-weight: 400;
-      font-size: 16px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     ::-webkit-input-placeholder {
       font-weight: 400;
-      font-size: 16px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* 使用webkit内核的浏览器 */
     :-moz-placeholder {
       font-weight: 400;
-      font-size: 16px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
 
     /* Firefox版本19+ */
     :-ms-input-placeholder {
       font-weight: 400;
-      font-size: 16px;
+      font-size: $fontE;
       color: rgba(40,46,48,0.6);
     }
   }
@@ -258,7 +258,7 @@ onMounted(() => {
   .error {
     margin-top: 10px;
     position: relative;
-    color: $colorMain;
+    color: #e2231a;
     height: 16px;
     line-height: 16px;
   }

+ 2 - 2
xinkeaboard-web/pages/member/phone.vue

@@ -348,7 +348,7 @@ watch([old_sms_code, new_sms_code, new_mobile], () => {
           top: 0;
           width: 120px;
           height: 40px;
-          background: #00985e;
+          background: $colorMain;
           color: white;
           font-size: 14px;
           border-radius: 0 3px 3px 0;
@@ -363,7 +363,7 @@ watch([old_sms_code, new_sms_code, new_mobile], () => {
       .next {
         width: 170px;
         height: 40px;
-        background: #00985e;
+        background: $colorMain;
         color: #fff;
         font-size: 18px;
         font-weight: bold;