fix: 修复UI相关问题

xinkeaboard-web/assets/style/decorate.scss

@@ -3644,7 +3644,7 @@ a {
 .adv_27_wrap .floor_title h2 {
   width: 100%;
   line-height: 35px;
-  text-align: center;
+  // text-align: center;
   margin: 0 auto;
   font-size: 28px;
   color: #333;
@@ -3684,14 +3684,18 @@ a {
   float: left;
   width: 234px;
   min-height: 200px;
-  margin: 0 10px 10px 0;
+  // margin: 0 10px 10px 0;
   padding: 10px;
   background-color: #fff;
   box-sizing: border-box;
 }
 
-.adv_27_wrap .floor_goods .item:nth-child(5n + 5) {
-  margin-right: 0 !important;
+.adv_27_wrap .floor_goods .item:nth-child(n + 6) {
+  border-top: 1px solid #f2f2f2;
+}
+
+.adv_27_wrap .floor_goods .item {
+  border-right: 1px solid #f2f2f2;
 }
 
 .adv_27_wrap .floor_goods .item .wrap {
@@ -4103,25 +4107,27 @@ a {
     overflow: hidden;
   }
   .sourcing-title {
-    font-size: 32px;
     font-weight: bold;
+    font-size: 40px;
+    color: #FFFFFF;
     margin-bottom: 20px;
     transform-origin: left;
   }
   .sourcing-desc {
+    font-weight: 400;
     font-size: 16px;
-    color: #555;
+    color: #FFFFFF;
     p {
-      margin-bottom: 8px;
+      // margin-bottom: 8px;
     }
   }
   .sourcing-more {
     margin-top: 45px;
-    font-weight: 500;
-    font-size: 14px;
+    
     a {
-      color: #222;
-      font-weight: 500;
+       font-weight: bold;
+       font-size: 16px;
+       color: #FFFFFF;
     }
   }
 }

xinkeaboard-web/assets/style/register.scss

@@ -93,8 +93,9 @@
           .item1 {
             flex: 1;
             text-align: center;
-            font-size: 18px;
-            color: #666;
+            font-weight: bold;
+            font-size: 32px;
+            color: #282E30;
             position: relative;
             cursor: default;
           }
@@ -120,10 +121,12 @@
             display: block;
             line-height: 50px;
             margin-right: 10px;
+            font-weight: bold;
+            font-size: 14px;
             color: #999;
 
             &:hover {
-              color: #000;
+              color: $colorMain;
             }
           }
 

xinkeaboard-web/components/Home/sourcingForm.vue

@@ -211,12 +211,12 @@ onMounted(() => {
 
 .self-btn {
   width: 100%;
-  background: #00985e;
+  background: $colorMain;
 }
 
 .self-btn:focus,
 .self-btn:hover {
-  border-color: #1ba66c;
-  background-color: #1ba66c;
+  border-color: $colorMain;
+  background-color: $colorMain;
 }
 </style>

xinkeaboard-web/components/NavCatHeader.vue

@@ -68,7 +68,11 @@ const navClick = (val) => {
     if (val.link_value) {
       val.link_value = quillEscapeToHtml(val.link_value);
     }
-    window.open(val.link_value, "_blank");
+    router.push(val.link_value)
+    // router.resolve({
+    //   path: val.link_value
+    // })
+    // window.open(val.link_value, "_blank");
   } else if (val.link_type == "goods") {
     //跳转商品详情页
     // let routeUrl = router.resolve({
@@ -78,6 +82,7 @@ const navClick = (val) => {
     //   },
     // });
     let href  = "/goods/detail/"+ calcProductName(val.info.goodsName) +'_'+ val.info.defaultProductId
+    // router.push(href)
     window.open(href, "_blank");
   } else if (val.link_type == "category") {
     // 分类列表

xinkeaboard-web/components/NavTopBar.vue

@@ -303,11 +303,11 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
 
             .li_item_more {
               position: absolute;
-              width: 120px;
+              width: 180px;
               padding: 5px 3px;
               left: 50%;
               transform: translateX(-50%);
-              top: 21px;
+              top: 38px;
               background: #fff;
               box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
               z-index: 999;

xinkeaboard-web/components/SldDiy.vue

@@ -1009,17 +1009,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 }">{{
               item.json_data.title_info.title_name
             }}</span>
-            <font
+            <!-- <font
                     v-bind:style="{ backgroundColor: item.json_data.title_info.title_color }"
-            >&nbsp;</font
-            >
+            >&nbsp;</font -->
+            <!-- > -->
           </h2>
         </div>
         <div class="floor_goods">

xinkeaboard-web/components/register/RegisterMail.vue

@@ -40,6 +40,7 @@
       />
       <span class="verify-code-accept">
         <el-button
+          type="primary"
           @click="showHMVerify"
           :disabled="countDownNumer"
           :loading="getVerifyCodeLoading"
@@ -253,6 +254,32 @@ const clearInputVal = (type) => {
     margin-top: 15px;
     border-radius: 2px;
 
+    input::placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    ::-webkit-input-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* 使用webkit内核的浏览器 */
+    :-moz-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* Firefox版本19+ */
+    :-ms-input-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
     &:first-child {
       margin-top: 0;
     }
@@ -280,7 +307,6 @@ const clearInputVal = (type) => {
       padding: 0 44px 0 60px;
       width: 326px;
     }
-
     &.code {
       .input {
         padding-right: 10px;
@@ -318,6 +344,32 @@ const clearInputVal = (type) => {
     height: 40px;
     margin-top: 10px;
 
+    input::placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    ::-webkit-input-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* 使用webkit内核的浏览器 */
+    :-moz-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* Firefox版本19+ */
+    :-ms-input-placeholder {
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(40,46,48,0.6);
+    }
+
     &-icon {
       width: 50px;
       display: flex;
@@ -350,15 +402,16 @@ const clearInputVal = (type) => {
       .el-button {
         width: 100%;
         height: 100%;
-        color: #666;
-        background: #f8f8f8;
+        font-weight: bold;
+        color: #FFFFFF;
+        background: $colorMain;
         border-left: none;
         border-radius: 0;
         font-size: 12px;
 
         &:hover {
-          border-color: #e8e8e8;
-          color: $colorMain;
+          // border-color: #e8e8e8;
+          // color: $colorMain;
         }
       }
     }

xinkeaboard-web/pages/Topic.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <SldHomeTopSearch />
+    <NavTopBar/>
     <NavCatHeader />
     <div class="bottom_line"></div>
     <div class="index">

xinkeaboard-web/pages/article.vue

@@ -2,6 +2,7 @@
 <template>
   <div>
     <SldHomeTopSearch />
+    <NavTopBar/>
     <NavCatHeader />
     <div class="article_line"></div>
     <div class="headPath">

xinkeaboard-web/pages/login.vue

@@ -44,10 +44,10 @@
               flex_row_end_center: wxEnable != 0,
             }"
           >
-            <a href="javascript:void(0)" @click="goToPage('/register')">{{
+            <a class="a_link" href="javascript:void(0)" @click="goToPage('/register')">{{
               L["立即注册"]
             }}</a>
-            <router-link tag="a" :to="`/member/login/forget`">{{
+            <router-link class="a_link" tag="a" :to="`/member/login/forget`">{{
               L["忘记密码"]
             }}</router-link>
           </div>
@@ -212,6 +212,32 @@ onMounted(() => {
       padding: 0 44px 0 60px;
       width: 326px;
     }
+
+    input::placeholder {
+      font-weight: 400;
+      font-size: 16px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    ::-webkit-input-placeholder {
+      font-weight: 400;
+      font-size: 16px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* 使用webkit内核的浏览器 */
+    :-moz-placeholder {
+      font-weight: 400;
+      font-size: 16px;
+      color: rgba(40,46,48,0.6);
+    }
+
+    /* Firefox版本19+ */
+    :-ms-input-placeholder {
+      font-weight: 400;
+      font-size: 16px;
+      color: rgba(40,46,48,0.6);
+    }
   }
 
   .cancel {
@@ -240,12 +266,13 @@ onMounted(() => {
   .submit {
     margin-top: 35px;
     background: $colorMain;
-    color: #fff;
+    font-weight: bold;
+    font-size: 20px;
+    color: #FFFFFF;
     text-align: center;
     border-radius: 2px;
     width: 100%;
     height: 45px;
-    font-size: 18px;
     letter-spacing: 0px;
 
     &:hover {