fix: 修复UI相关问题

xinkeaboard-web/assets/language/en.js

@@ -171,6 +171,7 @@ export const lang_en = {
 
     //购物车页面
     '全选': 'select all',
+    '取消全选': 'cancel all',
     '商品信息': 'Product information',
     '单价': 'unit price',
     '小计（元）': '(Yuan)',

xinkeaboard-web/assets/language/zh.js

@@ -222,6 +222,7 @@ export const lang_zn = {
 
     //购物车页面
     '全选': '全选',
+    '取消全选': '取消全选',
     '商品信息': '商品信息',
     '单价': '单价',
     '小计（元）': '小计（元）',

xinkeaboard-web/assets/style/balance.scss

@@ -124,7 +124,7 @@
                 width: 113px;
                 height: 40px;
                 // border-right: 1px solid #e3e3e3;
-                &.green {
+                &.$colorMain {
                     color: #3fb091;
                 }
                 &.red {

xinkeaboard-web/assets/style/member/collect.scss

@@ -71,16 +71,25 @@ i {
             background: #ffffff;
 
             .sld_option {
+                display: flex;
+                justify-content: center;
+                align-items: center;
                 height: 52px;
-                width: 380px;
+                // width: 380px;
 
                 .sld_option_list {
-                    margin-top: 18px;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    // margin-top: 18px;
                     transition: all 0.5s;
                     margin-left: 15px;
+                    font-weight: bold;
+                    font-size: 16px;
+                    color: #282E30;
 
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
 
                     img {
@@ -95,17 +104,23 @@ i {
 
                 .sld_option_btn {
                     padding: 5px 20px 5px;
-                    margin-top: 13px;
-                    margin-right: 10px;
+                    margin-left: 20px;
+                    font-weight: 400;
+                    font-size: 16px;
+                    color: #282E30;
+                    // margin-top: 13px;
+                    // margin-right: 10px;
                     //font-family: "Microsoft YaHei";
-                    background-color: #fff;
                     border: 1px solid #e7e7e7;
                     border-radius: 5px;
                     transition: all 0.2s;
+                    width: 160px;
+                    height: 44px;
+                    background: #DDE1E6;
                     cursor: pointer;
 
                     &:hover {
-                        background-color: $colorMain2;
+                        background-color: $colorMain;
                         color: #fff;
                     }
                 }
@@ -120,20 +135,21 @@ i {
                     display: inline-block;
                     width: 178px;
                     text-align: center;
-                    font-size: 14px;
-                    color: #333;
+                    font-weight: bold;
+                    font-size: 16px;
+                    color: #282E30;
                     cursor: pointer;
                     border-right: 1px solid #eeeeee;
 
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
 
                 a.on {
-                    color: $colorMain2;
+                    color: #fff;
                     height: 53px;
-                    background-color: #fff;
+                    background-color: $colorMain;
                     font-weight: 600;
                 }
             }
@@ -170,16 +186,16 @@ i {
                     position: absolute;
                     right: 0;
                     top: 0;
-                    width: 240px;
+                    width: 100%;
                     height: 358px;
-                    background: rgba(0, 0, 0, 0.1);
+                    // background: rgba(0, 0, 0, 0.1);
 
                     .border {
                         display: block;
                         position: absolute;
-                        right: -1px;
-                        top: -1px;
-                        width: 241px;
+                        right: 0px;
+                        top: 0px;
+                        width: 100%;
                         height: 360px;
                         z-index: 0;
                         cursor: pointer;
@@ -191,7 +207,7 @@ i {
                             width: 31px;
                             height: 31px;
                             visibility: visible;
-                            background-image: url(/member/choose.png);
+                            // background-image: url(/member/choose.png);
                         }
                     }
 
@@ -206,7 +222,7 @@ i {
                     }
 
                     input[type="checkbox"]:checked~.border {
-                        border: 2px solid #e60012;
+                        border: 2px solid $colorMain;
 
                         .checklogo {
                             position: absolute;
@@ -214,7 +230,7 @@ i {
                             right: -2px;
                             width: 31px;
                             height: 31px;
-                            background-image: url(/member/chosen.png);
+                            // background-image: url(/member/chosen.png);
                         }
                     }
                 }
@@ -286,40 +302,48 @@ i {
                 .cg_btns {
                     position: absolute;
                     bottom: -1px;
-                    left: -1px;
-                    width: 240px;
+                    left: 0px;
+                    width: 100%;
                     height: 42px;
-
+                    background: #DDE1E6;
+                    &:hover {
+                        background-color: $colorMain;
+                    }
                     a {
                         float: left;
                         display: inline-block;
                         width: 100%;
                         height: 42px;
                         text-align: center;
-                        color: #666666;
-                        font-size: 12px;
+                        font-weight: 400;
+                        font-size: 16px;
+                        color: #282E30;
                         line-height: 42px;
                         box-sizing: border-box;
                         text-transform: uppercase;
                     }
 
-                    a:nth-child(1) {
-                        border-top: 1px solid #eeeeee;
-
-                        &:nth-child(1):hover {
-                            color: $colorMain;
-                            cursor: pointer;
-                        }
+                    a:hover {
+                        color: #fff;
                     }
 
-                    a:nth-child(2) {
-                        border: 1px solid #eee;
-                    }
+                    // a:nth-child(1) {
+                    //     border-top: 1px solid #eeeeee;
 
-                    a:nth-child(2):hover {
-                        color: $colorMain;
-                        cursor: pointer;
-                    }
+                    //     &:nth-child(1):hover {
+                    //         color: '#FFF';
+                    //         cursor: pointer;
+                    //     }
+                    // }
+
+                    // a:nth-child(2) {
+                    //     border: 1px solid #eee;
+                    // }
+
+                    // a:nth-child(2):hover {
+                    //     color: $colorMain;
+                    //     cursor: pointer;
+                    // }
                 }
 
                 .cg_price {

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

@@ -28,11 +28,16 @@ a:visited {
         position: relative;
     }
     .log_option {
+        width: 160px;
+        height: 44px;
+        background: #DDE1E6;
         position: absolute;
         right: 30px;
-        top: 11px;
+        top: 0px;
+        font-weight: 400;
+        font-size: 16px;
+        color: #282E30;
         padding: 5px 15px 5px;
-        background-color: #fff;
         border: 1px solid #cccccc;
         border-radius: 5px;
         cursor: pointer;

xinkeaboard-web/assets/style/member/myPoint.scss

@@ -7,7 +7,7 @@
     padding-right: 2px;
 }
 .colr1 {
-    color: green;
+    color: $colorMain;
     padding-right: 2px;
 }
 

xinkeaboard-web/assets/style/store/contac-about.scss

@@ -181,7 +181,7 @@
 .ly-left, .ly-right {
     display: inline;
 }
-.color-green {
+.color-$colorMain {
     color: #2dbb55;
 }
 .fb {

xinkeaboard-web/components/FooterBottom.vue

@@ -31,7 +31,7 @@
           </li>
         </div>
       </div>
-      <div class="bottom_box">
+      <!-- <div class="bottom_box">
         <div class="footer_bottom">
           <ul class="footer_list">
             <li v-for="({ linkName, linkUrl }, index) in helpList.data" :key="index">
@@ -48,7 +48,7 @@
             {{ CopyrightData.data[2] }} {{ L["提供技术支持"] }}
           </p>
         </div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -138,28 +138,30 @@ getCopyrightData();
   .link_box {
     border-top: 1px dashed #f2f2f2;
     padding-top: 50px;
-    width: 1210px;
+    width: 100%;
     margin: 0 auto 50px;
     display: flex;
     position: relative;
-    flex-direction: row;
-    justify-content: space-between;
+    // flex-direction: row;
+    justify-content: space-around;
 
     .link_wrap {
       text-align: left;
 
       p {
+        font-weight: bold;
         font-size: 16px;
-        font-weight: 600;
+        color: #282E30;
         margin-bottom: 20px;
-        color: #333333;
       }
 
       li {
         line-height: 25px;
 
         a {
-          color: #333333;
+          font-weight: 400;
+          font-size: 12px;
+          color: rgba(40,46,48,0.6);
 
           &:hover {
             color: $colorMain;

xinkeaboard-web/components/MemberLeftNav.vue

@@ -199,12 +199,12 @@ const testIfShow = (nav_info) => {
 
     &:hover {
       font-weight: bold;
-      color: $colorMain2;
+      color: $colorMain;
     }
 
     &.cur_code_active {
       font-weight: bold;
-      color: $colorMain2;
+      color: $colorMain;
     }
   }
 }

xinkeaboard-web/components/MemberTitle.vue

@@ -25,18 +25,21 @@ defineProps(["memberTitle","memberPath","memberTitleS"]);
    
     background: $colorK;
     .el-breadcrumb__item{
+        font-weight: 400;
+        font-size: 12px;
+        color: #282E30;
         height: 46px;
         line-height: 46px;
     }
     .el-breadcrumb__inner {
-        color:#666666!important;
+        color: $colorMain !important;
         font-weight: 700!important;
     }
     .is-link{
-        color: #666666!important;
+        color: #282E30 !important;
         font-weight: 400!important;
         &:hover{
-            color: #333333!important;
+            color: $colorMain !important;
             font-weight: 700!important;
         }
     }

xinkeaboard-web/components/MemberTop.vue

@@ -117,8 +117,9 @@ watchEffect(() => {
 .sld_member_top {
   .sld_member_top_zoom {
     width: 100%;
-    background-color: $colorMain;
+    background: #F6F8FA;
     margin-bottom: 10px;
+    padding-left: 100px;
 
     .container {
       width: 1210px;
@@ -174,26 +175,28 @@ watchEffect(() => {
       dd {
         position: relative;
         float: left;
+        background: #FFFFFF;
 
         a {
           display: block;
           line-height: 64px;
-          color: rgba(255, 255, 255, 0.8);
           margin: 0 25px;
-          font-size: 15px;
+          font-weight: bold;
+          font-size: 16px;
+          color: #282E30;
 
           &.router-link-active {
             &::after {
-              position: absolute;
-              bottom: 0;
-              left: 50%;
-              content: "";
-              width: 0;
-              height: 0;
-              transform: translateX(-50%);
-              border-width: 6px;
-              border-style: solid;
-              border-color: transparent transparent #fff transparent;
+              // position: absolute;
+              // bottom: 0;
+              // left: 50%;
+              // content: "";
+              // width: 0;
+              // height: 0;
+              // transform: translateX(-50%);
+              // border-width: 6px;
+              // border-style: solid;
+              // border-color: transparent transparent #fff transparent;
             }
           }
 
@@ -215,14 +218,15 @@ watchEffect(() => {
             &::after {
               position: absolute;
               bottom: 0;
-              left: 50%;
+              left: 0;
               content: "";
-              width: 0;
-              height: 0;
-              transform: translateX(-50%);
-              border-width: 6px;
-              border-style: solid;
-              border-color: transparent transparent #fff transparent;
+              width: 100%;
+              height: 4px;
+              background-color: $colorMain;
+              // transform: translateX(-50%);
+              // border-width: 6px;
+              // border-style: solid;
+              // border-color: transparent transparent red transparent;
             }
           }
 
@@ -415,13 +419,13 @@ watchEffect(() => {
       }
 
       .first_dt {
-        width: 130px;
+        // width: 130px;
         height: 32px;
 
         a {
-          color: #666666;
-          font-size: 14px;
-          line-height: 30px;
+          font-weight: bold;
+          font-size: 16px;
+          color: $colorMain;
         }
       }
 
@@ -479,7 +483,8 @@ watchEffect(() => {
 
         &.button {
           height: 32px;
-          color: #666666;
+          color: #fff;
+          background-color: $colorMain;
           font-size: 14px;
           cursor: pointer;
           padding: 0 15px;

xinkeaboard-web/components/NavCatHeader.vue

@@ -170,7 +170,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
     overflow: visible;
     flex:0 0 250px;
     height: 100%;
-    background: #fff;
+    // background: #fff;
     letter-spacing: 0px;
     line-height: 30px;
     display: flex;

xinkeaboard-web/components/NavTopBar.vue

@@ -8,7 +8,7 @@
           {{ configInfo.data.basic_site_name }}
         </span>
         <div v-show="loginFlag">
-          <span class="register h1" @click="goToByPush('/member/home')" style="font-weight:bold;color:#444;" >{{
+          <span class="register h1" @click="goToByPush('/member/home')" >{{
             memberInfo.memberNickName || memberInfo.memberName
           }}</span>
           <span class="register h1 login_out" @click="loginOut()"
@@ -192,6 +192,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   align-items: center;
   justify-content: center;
   padding-bottom: 10px;
+  // padding-top: 10px;
   padding-left: 150px;
   border-bottom: 1px solid #dbdbdb;
 

xinkeaboard-web/layouts/member.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <NavTopBar/>
         <MemberTop/>
+        <NavTopBar/>
         <div class="sld_member_main_content">
             <div class="container">
                 <MemberLeftNav></MemberLeftNav>

xinkeaboard-web/pages/home/contact.vue

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

xinkeaboard-web/pages/member/account.vue

@@ -179,7 +179,7 @@ const toPage = (url, type) => {
         }
 
         .icon-xuanweimorendizhi {
-          color: green;
+          color: $colorMain;
         }
 
         .s1{

xinkeaboard-web/pages/member/balance.vue

@@ -115,7 +115,7 @@
         <div
           :class="{
             num: true,
-            green: true,
+            $colorMain: true,
             flex_row_center_center: true,
             red: balanceItem.state == 2,
           }"

xinkeaboard-web/pages/member/collect.vue

@@ -31,7 +31,7 @@
               v-show="optAct"
               @click="selectAll(true)"
             >
-              <img :src="collectGoodsChoose" alt="" />
+              <!-- <img :src="collectGoodsChoose" alt="" /> -->
               <span ref="chooseWord">{{ L["全选"] }}</span>
             </div>
             <div
@@ -46,7 +46,7 @@
               v-show="optAct"
               @click="cancelCollect"
             >
-              <img src="/member/delete.png" alt="" />
+              <!-- <img src="/member/delete.png" alt="" /> -->
               <span>{{ L["取消收藏"] }}</span>
             </div>
             <button class="sld_option_btn fr" @click="optAct = !optAct">
@@ -104,7 +104,7 @@
                     v-model="chosedItem"
                   />
                   <label :for="`GoodsCheck${index}`" class="border">
-                    <div class="checklogo"></div>
+                    <!-- <div class="checklogo"></div> -->
                   </label>
                 </div>
               </li>
@@ -345,7 +345,7 @@ const selectAll = (checks) => {
       listArr.push(item.productId);
     });
     chosedItem.value = listArr;
-    proxy.$refs.chooseWord.style.color = "#e1251b";
+    proxy.$refs.chooseWord.style.color = "$colorMain";
     collectGoodsChoose.value = ref("/member/chooseAll_red.png");
   } else {
     chosedItem.value = [];
@@ -355,7 +355,7 @@ const selectAll = (checks) => {
 };
 watch(chosedItem, () => {
   if (chosedItem.value.length == collectGoodsData.list.length) {
-    proxy.$refs.chooseWord.style.color = "#e1251b";
+    proxy.$refs.chooseWord.style.color = "$colorMain";
     collectGoodsChoose.value = ref("/member/chooseAll_red.png");
   } else {
     proxy.$refs.chooseWord.style.color = "";

xinkeaboard-web/pages/member/download/center.vue

@@ -247,8 +247,8 @@
             width: 105px;
             height: 32px;
             border: none;
-            background-color: #f7f7f7;
-            color: #000;
+            background-color: $colorMain;
+            color: #fff;
             line-height: 32px;
 
             text-align: center;

xinkeaboard-web/pages/member/email.vue

@@ -487,11 +487,11 @@ onUnmounted(() => {
           // text-align: center; /* 多行文本居中 */
           // position: absolute;
           white-space: pre-wrap;
-          right: -25px;
+          right: -24px;
           top: 0;
           width: 120px;
           height: 40px;
-          background: #00985e;
+          background: $colorMain;
           color: white;
           font-size: 14px;
           border-radius: 0 3px 3px 0;
@@ -516,7 +516,7 @@ onUnmounted(() => {
       .next {
         width: 170px;
         height: 40px;
-        background: #00985e;
+        background: $colorMain;
         color: #fff;
         font-size: 18px;
         font-weight: bold;

xinkeaboard-web/pages/member/enquiry/list.vue

@@ -390,8 +390,8 @@ const indexMethod = (index) => {
     width: 105px;
     height: 32px;
     border: none;
-    background-color: #f7f7f7;
-    color: #000;
+    background-color: $colorMain;
+    color: #fff;
     line-height: 32px;
 
     text-align: center;

xinkeaboard-web/pages/member/footprint.vue

@@ -15,7 +15,7 @@
           <el-timeline-item
             :timestamp="time"
             placement="top"
-            color="#00985e"
+            color="#036EB8"
             v-for="({ productLookLogInfoList, time }, index) in looklog.log"
             :key="index"
           >

xinkeaboard-web/pages/member/pwd/login.vue

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