fix: 调整门户网站样式

xinkeaboard-web/assets/style/_variable.scss

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

xinkeaboard-web/assets/style/addressList.scss

@@ -57,7 +57,7 @@
             height: 14px;
 
             .red {
-                color: $colorMain2;
+                color: $colorMain;
             }
 
             .iconfont {
@@ -66,7 +66,7 @@
                 color: #C8C8C8;
 
                 &:hover {
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
         }

xinkeaboard-web/assets/style/afterSalesList.scss

@@ -21,11 +21,11 @@
                 color: #333333;
                 font-size: 14px;
                 &:hover {
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
                 &.active_title {
                     border: none;
-                    color: $colorMain2;
+                    color: $colorMain;
                     font-weight: 600;
                 }
                 &:nth-last-of-type(1) {

xinkeaboard-web/assets/style/applyRefund.scss

@@ -41,7 +41,7 @@
                 font-weight: bold;
                 color: #999999;
                 .refund_amount_price {
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
                 .edit_price_btn {
                     color: #1c77ff;
@@ -74,7 +74,7 @@
                     color: #333333;
                 }
                 .ok_edit_amount {
-                    background: $colorMain2;
+                    background: $colorMain;
                     border-radius: 0 5px 5px 0;
                     color: #ffffff;
                 }
@@ -100,7 +100,7 @@
     .apply_refund_btn {
         width: 80px;
         height: 30px;
-        background: $colorMain2;
+        background: $colorMain;
         border-radius: 5px;
         font-size: 14px;
         //font-family: Microsoft YaHei;
@@ -131,7 +131,7 @@
         width: 100px;
         margin-right: 48px;
         span {
-            color: $colorMain2;
+            color: $colorMain;
         }
     }
     .marginBottom20 {

xinkeaboard-web/assets/style/balance.scss

@@ -25,7 +25,7 @@
             }
 
             .red {
-                color: $colorMain2;
+                color: $colorMain;
                 font-size: 38px;
                 //font-family: Microsoft YaHei;
                 font-weight: bold;
@@ -128,7 +128,7 @@
                     color: #3fb091;
                 }
                 &.red {
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
 

xinkeaboard-web/assets/style/cartIndex.scss

@@ -722,7 +722,7 @@
         span {
             width: 115px;
             height: 30px;
-            background: $colorMain2;
+            background: $colorMain;
             border-radius: 3px;
             display: block;
             font-size: 14px;

xinkeaboard-web/assets/style/confirmOrder.scss

@@ -189,7 +189,7 @@
       width: 370px;
       font-size: 14px;
       .replace_address {
-        color: $colorMain2;
+        color: $colorMain;
         line-height: 14px;
       }
     }
@@ -359,7 +359,7 @@
       .discounts,
       .shipping {
         .red {
-          color: $colorMain2;
+          color: $colorMain;
         }
         span:nth-child(2) {
           width: 106px;
@@ -590,7 +590,7 @@
       }
     }
     .active {
-      border: 1px solid $colorMain2;
+      border: 1px solid $colorMain;
     }
     .add_voice_btn {
       width: 80px;
@@ -655,7 +655,7 @@
           color: #999999;
         }
         .active {
-          border: 1px solid $colorMain2;
+          border: 1px solid $colorMain;
           color: #333333;
         }
         .select_btn:nth-child(1) {
@@ -788,7 +788,7 @@
       }
     }
     .select {
-      border: 1px solid $colorMain2;
+      border: 1px solid $colorMain;
     }
   }
   // ::-webkit-scrollbar {

xinkeaboard-web/assets/style/coupon.scss

@@ -27,14 +27,14 @@
                     }
 
                     &.active {
-                        color: $colorMain2;
+                        color: $colorMain;
                         border: none;
                         border-right: 1px solid #eeeeee;
                         background: #ffffff;
                         font-weight: 600;
                     }
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
             }
@@ -111,7 +111,7 @@
                 .btn {
                     color: #878787;
                     .normal {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                     position: absolute;
                     bottom: 17px;

xinkeaboard-web/assets/style/decorate.scss

@@ -257,7 +257,7 @@
 }
 
 .modal_goods_wrap .goods_price {
-  color: $colorMain2;
+  color: $colorMain;
   font-size: 12px;
 }
 
@@ -271,7 +271,7 @@
   box-sizing: border-box;
 }
 .adv_02_center .goods_item:hover .right .goods_name{
-  color:$colorMain2
+  color:$colorMain
 }
 .adv_02_center .goods_item:hover .left{
   opacity: .5;
@@ -557,7 +557,7 @@
   width: 912px;
   height: 482px;
   border-style: solid;
-  // border-color: $colorMain2;
+  // border-color: $colorMain;
   border-width: 2px 0 0 0;
   float: left;
   position: relative;
@@ -596,7 +596,7 @@
   display: inline-block;
   width: 39px;
   height: 1px;
-  background: $colorMain2;
+  background: $colorMain;
   position: relative;
   top: -4px;
 }
@@ -604,7 +604,7 @@
 .floor_right_new .floor_right_new_top_title span {
   font-size: 14px;
   font-weight: bold;
-  color: $colorMain2;
+  color: $colorMain;
   margin: 0 9px;
 }
 

xinkeaboard-web/assets/style/enquiry.scss

@@ -17,9 +17,13 @@
     }
 }
 
+.self-btn {
+    background-color: $colorMain;
+}
+
 .self-btn:focus, .self-btn:hover {
-    border-color: #1ba66c;
-    background-color: #1ba66c;
+    border-color: $colorMain;
+    background-color: $colorMain;
 }
 
 .cancel-btn:focus, .cancel-btn:hover {

xinkeaboard-web/assets/style/goodsDetail.scss

@@ -101,8 +101,8 @@
 
                         .description_active {
                             background: #ffffff;
-                            border-top: 2px solid $colorMain2;
-                            color: $colorMain2;
+                            border-top: 2px solid $colorMain;
+                            color: $colorMain;
                         }
                     }
 
@@ -915,7 +915,7 @@
             }
 
             .p_price {
-                color: $colorMain2;
+                color: $colorMain;
                 font-size: 16px;
                 font-weight: 600;
                 margin-left: -6px;
@@ -1050,7 +1050,7 @@
                 .full_pre_tips {
                     width: 5px;
                     height: 5px;
-                    background: $colorMain2;
+                    background: $colorMain;
                     border-radius: 50%;
                     margin-top: 5px;
                 }
@@ -1627,10 +1627,10 @@
         .buy_now {
             padding: 5px;
             height: 30px;
-            border: 1px solid #00985e;
+            border: 1px solid $colorMain;
             border-radius: 5px;
             font-size: 16px;
-            color: #00985e;
+            color: $colorMain;
             line-height: 30px;
             cursor: pointer;
             font-weight: 700;
@@ -1850,7 +1850,7 @@
                     font-size: 12px;
                     //font-family: Microsoft YaHei;
                     font-weight: 400;
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
 
@@ -2021,7 +2021,7 @@
                             font-size: 14px;
                             //font-family: Microsoft YaHei;
                             font-weight: bold;
-                            color: $colorMain2;
+                            color: $colorMain;
                         }
                     }
                 }
@@ -2060,8 +2060,8 @@
 
                 .description_active {
                     background: #ffffff;
-                    border-top: 2px solid $colorMain2;
-                    color: $colorMain2;
+                    border-top: 2px solid $colorMain;
+                    color: $colorMain;
                 }
             }
 
@@ -2354,7 +2354,7 @@
                             }
 
                             &.comments_nav_pre_active {
-                                color: $colorMain2;
+                                color: $colorMain;
                             }
                         }
                     }
@@ -2468,7 +2468,7 @@
                         .server_pre_tips {
                             width: 5px;
                             height: 5px;
-                            background: $colorMain2;
+                            background: $colorMain;
                             border-radius: 50%;
                             display: block;
                             margin-right: 10px;
@@ -2551,7 +2551,7 @@
                                 font-size: 16px;
                                 //font-family: Microsoft YaHei;
                                 font-weight: 400;
-                                color: $colorMain2;
+                                color: $colorMain;
                             }
                         }
                     }

xinkeaboard-web/assets/style/goodsList.scss

@@ -255,7 +255,7 @@ ul {
                 }
             }
             & > a.btn_sort {
-                color: $colorMain2;
+                color: $colorMain;
             }
             i {
                 color: #afafaf;
@@ -263,9 +263,9 @@ ul {
             & > a {
                 margin: 0 20px 0 15px;
                 &:hover {
-                    color: $colorMain2;
+                    color: $colorMain;
                     i {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
             }
@@ -309,12 +309,12 @@ ul {
             }
             .sld_price_jt_down {
                 &::before {
-                    border-color: $colorMain2 transparent transparent transparent;
+                    border-color: $colorMain transparent transparent transparent;
                 }
             }
             .sld_price_jt_up {
                 &::after {
-                    border-color: transparent transparent $colorMain2 transparent;
+                    border-color: transparent transparent $colorMain transparent;
                 }
             }
             .goods_page {
@@ -323,7 +323,7 @@ ul {
                 p {
                     display: inline-block;
                     em {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
                 a {
@@ -418,7 +418,7 @@ ul {
                 }
             }
             .sld_goods_price {
-                color: $colorMain2;
+                color: $colorMain;
                 font-size: 14px;
                 padding: 0px;
                 height: 38px;
@@ -513,7 +513,7 @@ ul {
                         margin-right: 6px;
                     }
                     &.on {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
             }

xinkeaboard-web/assets/style/logistics.scss

@@ -111,7 +111,7 @@
         height: 34px;
         border: none;
         border-radius: 0;
-        background-color: $colorMain2;
+        background-color: $colorMain;
         color: #fff;
         line-height: 34px;
         text-align: center;

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

@@ -249,8 +249,8 @@ i {
                     em {
                         display: inline-block;
                         padding: 1px 4px;
-                        border: 1px solid $colorMain2;
-                        color: $colorMain2;
+                        border: 1px solid $colorMain;
+                        color: $colorMain;
                         font-size: 12px;
                         -webkit-border-radius: 2px;
                         -moz-border-radius: 2px;
@@ -366,7 +366,7 @@ i {
                         line-height: 20px;
 
                         em {
-                            color: $colorMain2;
+                            color: $colorMain;
                             margin-left: 2px;
                         }
                     }
@@ -395,8 +395,8 @@ i {
                 }
 
                 .on {
-                    color: $colorMain2;
-                    border-bottom: 3px solid $colorMain2;
+                    color: $colorMain;
+                    border-bottom: 3px solid $colorMain;
                 }
             }
 
@@ -444,7 +444,7 @@ i {
 
                             i {
                                 font-size: 14px;
-                                color: $colorMain2;
+                                color: $colorMain;
                                 margin-right: 6px;
                             }
                         }
@@ -528,7 +528,7 @@ i {
                         }
 
                         .sld_follow_on {
-                            background-color: $colorMain2;
+                            background-color: $colorMain;
                             color: #fff;
                         }
                     }
@@ -542,7 +542,7 @@ i {
 
                         .goods_price {
                             font-size: 16px;
-                            color: $colorMain2;
+                            color: $colorMain;
                             margin-top: 3px;
                             font-weight: 600;
                         }

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

@@ -142,7 +142,7 @@ a:visited {
                     padding: 0 7px;
                     .fl {
                         font-size: 14px;
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                     .fr-wrap {
                         display: flex;
@@ -163,7 +163,7 @@ a:visited {
                         padding: 5px 0;
 
                         &:hover {
-                            color: $colorMain2;
+                            color: $colorMain;
                         }
                     }
                 }

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

@@ -376,7 +376,7 @@ a:active {
                     text-overflow: ellipsis;
                     white-space: nowrap;
                     &.price {
-                        color: $colorMain2;
+                        color: $colorMain;
                         padding: 0;
                     }
                 }
@@ -417,7 +417,7 @@ a:active {
                     padding: 16px 0;
                     .tag {
                         position: absolute;
-                        background-color: $colorMain2;
+                        background-color: $colorMain;
                         color: #fff;
                         padding: 2px 6px 2px;
                         top: 5px;
@@ -432,7 +432,7 @@ a:active {
                         right: 10px;
                         width: 16px;
                         height: 16px;
-                        background-color: $colorMain2;
+                        background-color: $colorMain;
                         border-radius: 50%;
                         text-align: center;
                         line-height: 16px;
@@ -443,10 +443,10 @@ a:active {
                         color: #333333;
                     }
                     &:hover a i {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                     &:hover span {
-                        box-shadow: 0 0 0 1px $colorMain2;
+                        box-shadow: 0 0 0 1px $colorMain;
                     }
                     a {
                         position: relative;
@@ -559,7 +559,7 @@ a:active {
                     font-size: 14px;
                     cursor: pointer;
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
                 ul {

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

@@ -22,7 +22,7 @@
                     text-align: center;
                     //font-family: MicrosoftYaHei-Bold;
                     font-weight: 600;
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
 
                 .refuse_reason {
@@ -35,9 +35,9 @@
                     height: 27px;
                     line-height: 25px;
                     padding: 0 12px;
-                    color: $colorMain2;
+                    color: $colorMain;
                     margin: 15px auto 0;
-                    border: 1px solid $colorMain2;
+                    border: 1px solid $colorMain;
                     -webkit-border-radius: 2px;
                     -moz-border-radius: 2px;
                     border-radius: 2px;
@@ -54,7 +54,7 @@
                         border-left: 1px solid #bbbbbb;
                     }
                     span:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
             }
@@ -302,7 +302,7 @@
                     width: 15%;
                     text-align: center;
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
             }
@@ -361,7 +361,7 @@
     .confirm_cancel_btn {
         width: 80px;
         height: 30px;
-        background: $colorMain2;
+        background: $colorMain;
         border-radius: 3px;
         line-height: 30px;
         text-align: center;
@@ -422,7 +422,7 @@
             }
         }
         .select {
-            border: 1px solid $colorMain2;
+            border: 1px solid $colorMain;
         }
     }
 }

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

@@ -231,7 +231,7 @@
             display: inline-block;
             width: 190px;
             height: 48px;
-            background-color: $colorMain2;
+            background-color: $colorMain;
             color: #fff;
             font-size: 14px;
             text-align: center;

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

@@ -219,15 +219,15 @@
                     text-align: center;
 
                     .detail:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
 
                     .evaluate_btn {
                         width: 90px;
                         height: 28px;
                         line-height: 26px;
-                        color: $colorMain2;
-                        border: 1px solid $colorMain2;
+                        color: $colorMain;
+                        border: 1px solid $colorMain;
                         text-align: center;
                         margin-top: 15px;
                     }

xinkeaboard-web/assets/style/msgList.scss

@@ -10,7 +10,7 @@
         color: #333333;
         font-size: 16px;
         font-weight: bold;
-        border-left: 2px solid $colorMain2;
+        border-left: 2px solid $colorMain;
         margin: 12px 10px;
         padding-left: 10px;
     }
@@ -25,7 +25,7 @@
             .msg_con_right{
                 .msg_del{
                     width: 74px;
-                    background-color: $colorMain2;
+                    background-color: $colorMain;
                     height: 24px;
                     line-height: 24px;
                     padding: 0 13px;
@@ -107,7 +107,7 @@
                                 width: 12px;
                                 height: 12px;
                                 border-radius: 50%;
-                                background-color: $colorMain2;
+                                background-color: $colorMain;
                                 margin-right: 6px;
                             }
                             p{

xinkeaboard-web/assets/style/msgSetting.scss

@@ -9,7 +9,7 @@
         color: #333333;
         font-size: 16px;
         font-weight: bold;
-        border-left: 2px solid $colorMain2;
+        border-left: 2px solid $colorMain;
         margin: 12px 10px;
         padding-left: 10px;
     }

xinkeaboard-web/assets/style/orderList.scss

@@ -32,12 +32,12 @@
                         border-left: none;
                     }
                     &:hover {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
 
                 .active {
-                    color: $colorMain2;
+                    color: $colorMain;
                     font-weight: 600;
                     position: relative;
 
@@ -48,7 +48,7 @@
                         bottom: -1px;
                         width: 100%;
                         height: 2px;
-                        background-color: $colorMain2;
+                        background-color: $colorMain;
                     }
                 }
             }
@@ -268,14 +268,14 @@
                         margin-top: 10px;
 
                         &:hover {
-                            color: $colorMain2;
+                            color: $colorMain;
                         }
 
                         cursor: pointer;
                     }
                     .detail {
                         &:hover {
-                            color: $colorMain2;
+                            color: $colorMain;
                         }
 
                         margin-top: 10px;
@@ -285,7 +285,7 @@
 
                 .state {
                     .state_value {
-                        color: $colorMain2;
+                        color: $colorMain;
                         margin-top: 5px;
                     }
 
@@ -335,7 +335,7 @@
     .confirm_cancel_btn {
         width: 80px;
         height: 30px;
-        background: $colorMain2;
+        background: $colorMain;
         border-radius: 3px;
         line-height: 30px;
         text-align: center;
@@ -397,7 +397,7 @@
             }
         }
         .select {
-            border: 1px solid $colorMain2;
+            border: 1px solid $colorMain;
         }
     }
 }

xinkeaboard-web/assets/style/pay.scss

@@ -37,7 +37,7 @@
 
             .price span {
                 font-size: 20px;
-                color: $colorMain2;
+                color: $colorMain;
                 margin: 0 3px;
             }
 
@@ -194,7 +194,7 @@
                 color: white;
                 margin-top: 55px;
                 outline: none;
-                background-color: $colorMain2;
+                background-color: $colorMain;
                 border-radius: 3px;
                 margin-left: 58px;
                 text-align: center;
@@ -221,7 +221,7 @@
                     color: #999;
                     font-size: 16px;
                     span {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
                 .refresh {

xinkeaboard-web/assets/style/point/order.scss

@@ -36,7 +36,7 @@
             width: 370px;
             font-size: 14px;
             .replace_address {
-                color: $colorMain2;
+                color: $colorMain;
                 line-height: 14px;
             }
         }
@@ -115,7 +115,7 @@
             width: 370px;
             font-size: 14px;
             .replace_address {
-                color: $colorMain2;
+                color: $colorMain;
                 line-height: 14px;
             }
         }
@@ -234,7 +234,7 @@
             .shipping {
                 margin-top: 20px;
                 .red {
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
                 span:nth-child(2) {
                     width: 174px;
@@ -430,7 +430,7 @@
             }
         }
         .active {
-            border: 1px solid $colorMain2;
+            border: 1px solid $colorMain;
         }
         .add_voice_btn {
             width: 80px;
@@ -489,7 +489,7 @@
                     color: #999999;
                 }
                 .active {
-                    border: 1px solid $colorMain2;
+                    border: 1px solid $colorMain;
                     color: #333333;
                 }
                 .select_btn:nth-child(1) {
@@ -620,7 +620,7 @@
             }
         }
         .select {
-            border: 1px solid $colorMain2;
+            border: 1px solid $colorMain;
         }
     }
     ::-webkit-scrollbar {

xinkeaboard-web/assets/style/point/pointGoodsDetail.scss

@@ -89,8 +89,8 @@
                         }
                         .description_active {
                             background: #ffffff;
-                            border-top: 2px solid $colorMain2;
-                            color: $colorMain2;
+                            border-top: 2px solid $colorMain;
+                            color: $colorMain;
                         }
                     }
                     .description_title_right {
@@ -597,7 +597,7 @@
                 color: #666666;
             }
             .p_price {
-                color: $colorMain2;
+                color: $colorMain;
                 font-size: 16px;
                 font-weight: 600;
                 margin-left: -6px;
@@ -716,7 +716,7 @@
                 .full_pre_tips {
                     width: 5px;
                     height: 5px;
-                    background: $colorMain2;
+                    background: $colorMain;
                     border-radius: 50%;
                     margin-top: 5px;
                 }
@@ -1254,7 +1254,7 @@
                     font-size: 12px;
                     //font-family: Microsoft YaHei;
                     font-weight: 400;
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
             .pre_service {
@@ -1376,11 +1376,11 @@
                         font-size: 14px;
                         //font-family: Microsoft YaHei;
                         font-weight: bold;
-                        color: $colorMain2;
+                        color: $colorMain;
                         // &:nth-child(2) {
                         //     font-size: 12px;
                         //     font-family: Microsoft YaHei;
-                        //     color: $colorMain2;
+                        //     color: $colorMain;
                         // }
                     }
                 }
@@ -1412,8 +1412,8 @@
                 }
                 .description_active {
                     background: #ffffff;
-                    border-top: 2px solid $colorMain2;
-                    color: $colorMain2;
+                    border-top: 2px solid $colorMain;
+                    color: $colorMain;
                 }
             }
             .description_title_right {
@@ -1657,7 +1657,7 @@
                                 margin-right: 0;
                             }
                             &.comments_nav_pre_active {
-                                color: $colorMain2;
+                                color: $colorMain;
                             }
                         }
                     }
@@ -1752,7 +1752,7 @@
                         .server_pre_tips {
                             width: 5px;
                             height: 5px;
-                            background: $colorMain2;
+                            background: $colorMain;
                             border-radius: 50%;
                             display: block;
                             margin-right: 10px;
@@ -1824,7 +1824,7 @@
                                 font-size: 16px;
                                 //font-family: Microsoft YaHei;
                                 font-weight: 400;
-                                color: $colorMain2;
+                                color: $colorMain;
                             }
                         }
                     }

xinkeaboard-web/assets/style/recharge.scss

@@ -188,7 +188,7 @@
                         margin-right: 20px;
                     }
                     .red {
-                        color: $colorMain2;
+                        color: $colorMain;
                     }
                 }
                 .qrcode_con {

xinkeaboard-web/assets/style/refundDetail.scss

@@ -125,7 +125,7 @@
                 font-size: 14px;
             }
             .refund_goods_price {
-                color: $colorMain2;
+                color: $colorMain;
                 font-size: 16px;
                 margin-top: 10px;
             }

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

@@ -181,7 +181,7 @@
 .ly-left, .ly-right {
     display: inline;
 }
-.color-$colorMain {
+.color-green {
     color: #2dbb55;
 }
 .fb {
@@ -363,12 +363,12 @@
 
 .self-btn{
     width: 100%;
-    background: #00985E;
+    background: $colorMain;
 }
 
 .self-btn:focus, .self-btn:hover {
-    border-color: #1ba66c;
-    background-color: #1ba66c;
+    // border-color: #1ba66c;
+    // background-color: #1ba66c;
 }
 
 .cancel-btn:focus, .cancel-btn:hover {

xinkeaboard-web/assets/style/storeList.scss

@@ -89,8 +89,8 @@
             }
         }
         a.on {
-            background-color: $colorMain2;
-            // border-color: $colorMain2;
+            background-color: $colorMain;
+            // border-color: $colorMain;
             color: #fff;
         }
         form {
@@ -108,8 +108,8 @@
         button {
             width: 75px;
             height: 30px;
-            background-color: #dcdcdc;
-            color: #333333;
+            background-color: $colorMain;
+            color: #fff;
             border: none;
             margin-left: -4px;
             outline: none;
@@ -182,7 +182,7 @@
                 i {
                     float: left;
                     margin: 0 3px;
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
             .sld_vendor_bottom {
@@ -202,7 +202,7 @@
                 }
                 a i {
                     font-size: 14px;
-                    color: $colorMain2;
+                    color: $colorMain;
                     margin-right: 6px;
                 }
             }
@@ -229,7 +229,7 @@
             border-left: none;
         }
         .sld_follow_on {
-            background-color: $colorMain2;
+            background-color: $colorMain;
             color: #fff;
         }
         .fr {
@@ -241,7 +241,7 @@
                 margin-right: 36px;
             }
             em {
-                color: $colorMain2;
+                color: $colorMain;
             }
         }
     }
@@ -276,7 +276,7 @@
         }
         .goods_price {
             font-size: 16px;
-            color: $colorMain2;
+            color: $colorMain;
             margin-top: 3px;
             font-weight: 600;
         }

xinkeaboard-web/assets/style/storeListAbout.scss

@@ -130,8 +130,8 @@
             }
         }
         a.on {
-            background-color: $colorMain2;
-            border-color: $colorMain2;
+            background-color: $colorMain;
+            border-color: $colorMain;
             color: #fff;
         }
         form {
@@ -218,7 +218,7 @@
                 i {
                     float: left;
                     margin: 0 3px;
-                    color: $colorMain2;
+                    color: $colorMain;
                 }
             }
             .sld_vendor_bottom {
@@ -238,7 +238,7 @@
                 }
                 a i {
                     font-size: 14px;
-                    color: $colorMain2;
+                    color: $colorMain;
                     margin-right: 6px;
                 }
             }
@@ -265,7 +265,7 @@
             border-left: none;
         }
         .sld_follow_on {
-            background-color: $colorMain2;
+            background-color: $colorMain;
             color: #fff;
         }
         .fr {
@@ -277,7 +277,7 @@
                 margin-right: 36px;
             }
             em {
-                color: $colorMain2;
+                color: $colorMain;
             }
         }
     }
@@ -310,7 +310,7 @@
         }
         .goods_price {
             font-size: 16px;
-            color: $colorMain2;
+            color: $colorMain;
             margin-top: 3px;
             font-weight: 600;
         }

xinkeaboard-web/assets/style/theme.scss

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

xinkeaboard-web/assets/style/variable.scss

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

xinkeaboard-web/components/GoodsListCate2.vue

@@ -81,7 +81,7 @@ a:visited {
         border-bottom: 1px solid #d7d7d7;
 
         em {
-          color: $colorMain2;
+          color: $colorMain;
           font-weight: 600;
           font-style: normal;
         }

xinkeaboard-web/components/GoodsListCate3.vue

@@ -347,7 +347,7 @@ a:visited {
   }
 
   .sld_goods_price {
-    color: $colorMain2;
+    color: $colorMain;
     font-size: 15px;
     font-weight: bold;
     margin-top: 6px;

xinkeaboard-web/components/MemberTop.vue

@@ -204,7 +204,7 @@ watchEffect(() => {
             display: block;
             position: absolute;
             background: #ffffff;
-            color: $colorMain2;
+            color: $colorMain;
             min-width: 20px;
             height: 20px;
             border-radius: 10px;
@@ -387,7 +387,7 @@ watchEffect(() => {
         .addcart_goods_num {
           font: 11px/16px Verdana;
           color: #fff;
-          background: $colorMain2;
+          background: $colorMain;
           text-align: center;
           display: inline-block;
           height: 16px;
@@ -399,7 +399,7 @@ watchEffect(() => {
 
         .iconfont {
           margin: 0 13px 0 12px;
-          color: $colorMain2;
+          color: $colorMain;
           font-size: 17px;
           font-weight: 600;
           vertical-align: bottom;

xinkeaboard-web/components/StoreItem.vue

@@ -31,7 +31,7 @@ import { getCurLanguage } from '@/composables/common.js';
 const L = getCurLanguage();
 const props = defineProps(["item", "ItemIndex", "skeleton"]);
 const score = ref(Number(props.item.serviceScore));
-const colors = ref(["#00985e", "#00985e", "#00985e"]);
+const colors = ref(["#036EB8", "#036EB8", "#036EB8"]);
 
 
 

xinkeaboard-web/composables/useFetchRaw.ts

@@ -4,7 +4,7 @@ import { webSiteFlagRelation, webSiteLanguageRelation } from "../utils/common";
 export async function useFetchRaw<T = any>(url: string, options?: any) {
   const config = useRuntimeConfig()
   const { appType, serverPath } = config.public as any;
-  url = url.replace('/api/', serverPath)
+  // url = url.replace('/api/', serverPath)
   const newOptions = {
     ...(options ?? {}),
     headers: {

xinkeaboard-web/nuxt.config.ts

@@ -7,7 +7,7 @@ const isDev = process.env.NODE_ENV === 'development';
 const appType = process.env.APP_TYPE;
 const SERVICE = process.env.SERVICE;
 export default defineNuxtConfig({
-  // ssr: !isDev,
+  ssr: !isDev,
   nitro: {
     output: {
       dir: isDev ? undefined : `.output-${appType}`

xinkeaboard-web/pages/home/about.vue

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

xinkeaboard-web/pages/member/account.vue

@@ -175,7 +175,7 @@ const toPage = (url, type) => {
         }
 
         .icon-jubao {
-          color: $colorMain2;
+          color: $colorMain;
         }
 
         .icon-xuanweimorendizhi {

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

@@ -903,12 +903,12 @@ router.beforeEach((to, from, next) => {
           }
 
           &:hover {
-            color: $colorMain2;
+            color: $colorMain;
           }
         }
 
         .active {
-          color: $colorMain2;
+          color: $colorMain;
           font-weight: 600;
           position: relative;
 
@@ -919,7 +919,7 @@ router.beforeEach((to, from, next) => {
             bottom: -1px;
             width: 100%;
             height: 2px;
-            background-color: $colorMain2;
+            background-color: $colorMain;
           }
         }
       }

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

@@ -329,7 +329,7 @@ watch([old_password, password, confirm_password], () => {
       .without_phone_tip {
         line-height: 56px;
         font-size: 16px;
-        color: $colorMain2;
+        color: $colorMain;
       }
 
       .sms_code_con {

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

@@ -335,7 +335,7 @@ onMounted(() => {});
       .without_phone_tip {
         line-height: 56px;
         font-size: 16px;
-        color: $colorMain2;
+        color: $colorMain;
       }
 
       .sms_code_con {

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

@@ -263,7 +263,7 @@ watch([password, confirm_password, sms_code], () => {
       .without_phone_tip {
         line-height: 56px;
         font-size: 16px;
-        color: $colorMain2;
+        color: $colorMain;
       }
 
       .sms_code_con {

xinkeaboard-web/pages/store/list/[...slug].vue

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