Browse Source

fix: 全局样式调整

周玉环 1 day ago
parent
commit
af4130ebe7

+ 30 - 15
xinkeaboard-web/assets/style/decorate.scss

@@ -278,8 +278,8 @@
   opacity: .5;
 }
 .clearfix {
-  /*clear: both;*/
-  /*overflow: hidden;*/
+  clear: both;
+  overflow: hidden;
 }
 
 .adv_02_center .goods_item .left {
@@ -988,14 +988,16 @@
 }
 
 .adv_04_wrap .floor_goods {
+  display: flex;
+  flex-wrap: wrap;
   position: relative;
   width: 100%;
   overflow: hidden;
 }
 
 .adv_04_wrap .floor_goods .item {
-  float: left;
-  width: 234px;
+  // float: left;
+  width: 20%;
   // height: 287px;
   // margin: 0 10px 10px 0;
   padding: 10px;
@@ -1003,17 +1005,18 @@
   box-sizing: border-box;
 }
 
-.adv_04_wrap .floor_goods .item:nth-child(n + 6) {
-  border-bottom: 1px solid #f2f2f2;
-}
+// .adv_04_wrap .floor_goods .item:nth-child(n + 6) {
+//   border-bottom: 1px solid #f2f2f2;
+// }
 
-.adv_04_wrap .floor_goods .item:nth-child(-n + 6) {
-  border-top: 1px solid #f2f2f2;
-  border-bottom: 1px solid #f2f2f2;
-}
+// .adv_04_wrap .floor_goods .item:nth-child(-n + 6) {
+//   border-top: 1px solid #f2f2f2;
+//   border-bottom: 1px solid #f2f2f2;
+// }
 
 .adv_04_wrap .floor_goods .item {
   border-right: 1px solid #f2f2f2;
+  border-bottom: 1px solid #f2f2f2;
 }
 
 
@@ -3680,14 +3683,16 @@ a {
 }
 
 .adv_27_wrap .floor_goods {
+  display: flex;
+  flex-wrap: wrap;
   position: relative;
   width: 100%;
   overflow: hidden;
 }
 
 .adv_27_wrap .floor_goods .item {
-  float: left;
-  width: 234px;
+  // float: left;
+  width: 20%;
   min-height: 200px;
   // margin: 0 10px 10px 0;
   padding: 10px;
@@ -3699,9 +3704,19 @@ a {
   border-bottom: 1px solid #f2f2f2;
 }
 
-.adv_27_wrap .floor_goods .item:nth-child(-n + 6) {
-  border-top: 1px solid #f2f2f2;
+// .adv_27_wrap .floor_goods .item:nth-child(-n + 6) {
+//   border-top: 1px solid #f2f2f2;
+//   border-bottom: 1px solid #f2f2f2;
+// }
+
+// .adv_27_wrap .floor_goods .item:nth-child(5n + 1) {
+//   border-bottom: none;
+// }
+
+.adv_27_wrap .floor_goods .item {
+  border-right: 1px solid #f2f2f2;
   border-bottom: 1px solid #f2f2f2;
+
 }
 
 .adv_27_wrap .floor_goods .item .wrap {

+ 210 - 178
xinkeaboard-web/assets/style/goodsDetail.scss

@@ -224,8 +224,10 @@
 
         // 商品所属分类 ,联系客服,关注店铺 start
         .goods_about_con {
+            display: flex;
+            align-items: center;
             width: 100%;
-            min-height: 40px;
+            min-height: 60px;
             background: #f8f8f8;
 
             .goods_about {
@@ -234,15 +236,16 @@
                 margin: 0 auto;
 
                 .goods_classify {
-                    font-size: 12px;
-                    //font-family: Microsoft YaHei;
                     font-weight: 400;
-                    color: #999999;
+                    font-size: 12px;
+                    color: #282E30;
 
                     a,
                     a:visited {
+                        font-weight: 400;
+                        font-size: 12px;
+                        color: #282E30;
                         text-decoration: none;
-                        color: #999999;
                     }
 
                     a:hover {
@@ -253,10 +256,9 @@
                 .goods_about_right {
                     .goods_about_store {
                         span:nth-child(1) {
-                            font-size: 14px;
-                            //font-family: Microsoft YaHei;
-                            font-weight: 400;
-                            color: #666666;
+                            font-weight: bold;
+                            font-size: 12px;
+                            color: #282E30;
                             line-height: 14px;
 
                             &:hover {
@@ -267,15 +269,17 @@
                         span:nth-child(2) {
                             font-size: 12px;
                             //font-family: Microsoft YaHei;
-                            font-weight: 400;
-                            color: #fefefe;
-                            line-height: 14px;
-                            width: 31px;
-                            height: 16px;
-                            background: $colorMain;
+                            font-weight: bold;
+                            color: $colorMain;
+                            line-height: 20px;
+                            width: 55px;
+                            height: 20px;
+                            // background: $colorMain;
                             border-radius: 2px;
                             text-align: center;
                             margin-left: 10px;
+                            border: 1px solid $colorMain;
+                            // padding: 2px 5px;
                         }
                     }
 
@@ -311,10 +315,13 @@
                         text-align: right;
 
                         span {
+                            font-weight: 400;
+                            font-size: 16px;
+                            color: #282E30;
                             line-height: 20px;
                             text-align: center;
                             float: right;
-                            margin-right: 8px;
+                            margin-left: 8px;
                         }
 
                         img {
@@ -519,133 +526,6 @@
                             color: #dddddd;
                         }
                     }
-
-                    // 分享 收藏 start
-                    .collection_share_btn {
-                        padding-left: 10px;
-
-                        .collection_btn {
-                            margin-top: 25px;
-
-                            img {
-                                width: 24px;
-                                height: 24px;
-                            }
-
-                            span {
-                                display: inline-block;
-                                width: 36px;
-                                font-size: 12px;
-                                //font-family: Microsoft YaHei;
-                                font-weight: 400;
-                                color: #666666;
-                                margin-left: 3px;
-                                margin-right: 2px;
-                            }
-                        }
-
-                        .share_btn {
-                            position: relative;
-                            margin-left: 18px;
-                            margin-top: 25px;
-
-                            .share_btn_con {
-                                padding-left: 10px;
-
-                                img {
-                                    width: 24px;
-                                    height: 24px;
-                                }
-
-                                span {
-                                    font-size: 12px;
-                                    //font-family: Microsoft YaHei;
-                                    font-weight: 400;
-                                    color: #666666;
-                                    margin-left: 8px;
-                                }
-
-                                &:hover span {
-                                    color: #333333;
-                                }
-                            }
-
-                            .share_list {
-                                margin-left: -1px;
-                                width: 80px;
-                                height: 140px;
-                                border: 1px solid #dfdfdf;
-                                border-radius: 2px;
-                                padding: 10px 0 10px 10px;
-                                position: absolute;
-                                top: -12px;
-                                display: none;
-                                z-index: 999;
-                                background: #fff;
-
-                                .share_btn_pre {
-                                    margin-top: 1px;
-                                    margin-bottom: 8px;
-
-                                    &:nth-last-of-type(1) {
-                                        margin-bottom: 0;
-                                    }
-
-                                    img {
-                                        width: 24px;
-                                        height: 24px;
-                                    }
-
-                                    span {
-                                        font-size: 12px;
-                                        //font-family: Microsoft YaHei;
-                                        font-weight: 400;
-                                        color: #666666;
-                                        margin-left: 8px;
-                                    }
-
-                                    &:hover span {
-                                        color: #333333;
-                                    }
-                                }
-
-                                .wx_share_code {
-                                    position: absolute;
-                                    right: -135px;
-                                    bottom: 0px;
-                                    width: 130px;
-                                    height: 135px;
-                                    background: #ffffff;
-                                    border: 1px solid #d9d9d9;
-
-                                    .wx_share_code_img {
-                                        canvas {
-                                            width: 90px !important;
-                                            height: 90px !important;
-                                        }
-                                    }
-
-                                    .wx_share_code_title {
-                                        font-size: 10px;
-                                        //font-family: Microsoft YaHei;
-                                        font-weight: 400;
-                                        color: #333333;
-                                        margin-top: 6px;
-                                    }
-                                }
-                            }
-
-                            &:hover .share_btn_con {
-                                display: none;
-                            }
-
-                            &:hover .share_list {
-                                display: block;
-                            }
-                        }
-                    }
-
-                    // 分享 收藏 end
                 }
 
                 .m_item_inner {
@@ -658,10 +538,9 @@
                     }
 
                     .detaile_name {
-                        font-size: 16px;
-                        //font-family: Microsoft YaHei;
                         font-weight: bold;
-                        color: #333333;
+                        font-size: 24px;
+                        color: #282E30;
                         margin-bottom: 6px;
                         text-overflow: -o-ellipsis-lastline;
                         overflow: hidden;
@@ -671,6 +550,8 @@
                         line-clamp: 2;
                         -webkit-box-orient: vertical;
                         line-height: 25px;
+                        margin-bottom: 20px;
+                        margin-top: 24px;
 
                         &.skeleton_detaile_name {
                             background: $colorSkeleton;
@@ -700,7 +581,7 @@
                     .summary {
                         width: 630px;
                         // min-height: 160px;
-                        background: url(/goods/goods_detail_bg.png) 100% 100%;
+                        background: rgb(3, 110, 184, 0.1);
                         padding: 20px 20px 20px;
                         box-sizing: border-box;
                     }
@@ -904,10 +785,10 @@
             .price_title {
                 margin-right: 20px;
                 text-transform: uppercase;
-                font-size: 14px;
+                font-size: 16px;
+                color: #282E30;
                 font-family: Microsoft YaHei;
                 font-weight: 400;
-                color: #666666;
 
                 &.activity_title {
                     letter-spacing: 1px !important;
@@ -916,6 +797,7 @@
 
             .p_price {
                 color: $colorMain;
+                font-weight: bold;
                 font-size: 16px;
                 font-weight: 600;
                 margin-left: -6px;
@@ -1625,17 +1507,157 @@
         }
 
         .buy_now {
-            padding: 5px;
-            height: 30px;
+            width: 260px;
+            height: 48px;
             border: 1px solid $colorMain;
-            border-radius: 5px;
+            // border-radius: 5px;
+            font-weight: bold;
             font-size: 16px;
-            color: $colorMain;
-            line-height: 30px;
+            color: #FFFFFF;
+            line-height: 48px;
+            background-color: $colorMain;
             cursor: pointer;
-            font-weight: 700;
         }
 
+        // 分享 收藏 start
+        .collection_share_btn {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 138px;
+            height: 48px;
+            line-height: 48px;
+            text-align: center;
+            // padding-left: 10px;
+            background: #F6F8FA;
+            border: 1px solid #ECF0F3;
+            margin-left: 20px;
+
+            .collection_btn {
+                width: 100%;
+                justify-content: center;
+                // margin-top: 25px;
+
+                img {
+                    width: 24px;
+                    height: 24px;
+                }
+
+                span {
+                    display: inline-block;
+                    // width: 36px;
+                    font-size: 12px;
+                    //font-family: Microsoft YaHei;
+                    font-weight: bold;
+                    color: #666666;
+                    margin-left: 3px;
+                    margin-right: 2px;
+                }
+            }
+
+            .share_btn {
+                position: relative;
+                margin-left: 18px;
+                margin-top: 25px;
+
+                .share_btn_con {
+                    padding-left: 10px;
+
+                    img {
+                        width: 24px;
+                        height: 24px;
+                    }
+
+                    span {
+                        font-size: 12px;
+                        //font-family: Microsoft YaHei;
+                        font-weight: 400;
+                        color: #666666;
+                        margin-left: 8px;
+                    }
+
+                    &:hover span {
+                        color: #333333;
+                    }
+                }
+
+                .share_list {
+                    margin-left: -1px;
+                    width: 80px;
+                    height: 140px;
+                    border: 1px solid #dfdfdf;
+                    border-radius: 2px;
+                    padding: 10px 0 10px 10px;
+                    position: absolute;
+                    top: -12px;
+                    display: none;
+                    z-index: 999;
+                    background: #fff;
+
+                    .share_btn_pre {
+                        margin-top: 1px;
+                        margin-bottom: 8px;
+
+                        &:nth-last-of-type(1) {
+                            margin-bottom: 0;
+                        }
+
+                        img {
+                            width: 24px;
+                            height: 24px;
+                        }
+
+                        span {
+                            font-size: 12px;
+                            //font-family: Microsoft YaHei;
+                            font-weight: 400;
+                            color: #666666;
+                            margin-left: 8px;
+                        }
+
+                        &:hover span {
+                            color: #333333;
+                        }
+                    }
+
+                    .wx_share_code {
+                        position: absolute;
+                        right: -135px;
+                        bottom: 0px;
+                        width: 130px;
+                        height: 135px;
+                        background: #ffffff;
+                        border: 1px solid #d9d9d9;
+
+                        .wx_share_code_img {
+                            canvas {
+                                width: 90px !important;
+                                height: 90px !important;
+                            }
+                        }
+
+                        .wx_share_code_title {
+                            font-size: 10px;
+                            //font-family: Microsoft YaHei;
+                            font-weight: 400;
+                            color: #333333;
+                            margin-top: 6px;
+                        }
+                    }
+                }
+
+                &:hover .share_btn_con {
+                    display: none;
+                }
+
+                &:hover .share_list {
+                    display: block;
+                }
+            }
+        }
+
+                    // 分享 收藏 end
+
         .add_cart {
             width: 175px;
             height: 50px;
@@ -1687,12 +1709,12 @@
         margin-left: 24px;
 
         .more_goods_title {
-            font-size: 14px;
-            //font-family: Microsoft YaHei;
-            font-weight: 400;
-            color: #333333;
+            font-weight: bold;
+            font-size: 16px;
+            color: #282E30;
             line-height: 30px;
             text-align: center;
+            margin-bottom: 10px;
         }
 
         .more_goods_list {
@@ -1788,15 +1810,15 @@
             box-sizing: border-box;
 
             .store_type {
-                width: 31px;
-                height: 16px;
+                width: 55px;
+                height: 20px;
                 background: $colorMain;
                 border-radius: 3px;
                 font-size: 12px;
                 //font-family: Microsoft YaHei;
                 font-weight: 400;
                 color: #ffffff;
-                line-height: 16px;
+                line-height: 20px;
                 text-align: center;
             }
 
@@ -1867,6 +1889,8 @@
         }
 
         .store_btn {
+            display: flex;
+            justify-content: space-around;
             margin-top: 14px;
 
             .store_btn_pre {
@@ -1877,10 +1901,12 @@
                 -ms-user-select: none;
                 /*IE10*/
                 user-select: none;
-                width: 114px;
-                height: 29px;
-                background: #ffffff;
-                border-radius: 3px;
+                width: max-content;
+                // height: 40px;
+                // padding: 2px 15px;
+                // background: #ffffff;
+                height: 40px;
+                // border-radius: 3px;
                 margin-right: 4px;
                 cursor: pointer;
                 border: 1px solid #dfdfdf;
@@ -1891,13 +1917,19 @@
                     margin-right: 5px;
                 }
 
-                .go_store_btn {
-                    font-size: 12px;
-                    //font-family: Microsoft YaHei;
-                    font-weight: 400;
-                    color: #333333;
-                    line-height: 39px;
-                    margin-top: 3px;
+                &.go_store_btn {
+                    width: 120px;
+                    background-color: $colorMain;
+                    color: #fff;
+                    // margin-top: 3px;
+
+                    a {
+                       color: #fff;
+                    }
+                }
+
+                &.follow_btn {
+                    width: 80px;
                 }
 
                 .btn_pre_img {
@@ -2049,19 +2081,19 @@
                     min-width: 120px;
                     height: 40px;
                     display: block;
+                    font-weight: bold;
                     font-size: 14px;
-                    //font-family: Microsoft YaHei;
-                    font-weight: 400;
-                    color: #333333;
+                    color: #282E30;
                     text-align: center;
                     line-height: 39px;
                     flex: 0 0 25%;
+                    background: #ECF0F3;
                 }
 
                 .description_active {
-                    background: #ffffff;
+                    background: $colorMain;
                     border-top: 2px solid $colorMain;
-                    color: $colorMain;
+                    color: #fff;
                 }
             }
 

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

@@ -113,7 +113,7 @@
             v-bind:key="index_right"
             @click="diyNavTo(item_right)"
           >
-            <a href="javascript:void(0)">
+            <a href="javascript:void(0)" v-if="item_right.imgUrl">
               <img v-bind:src="item_right.imgUrl" />
             </a>
           </span>

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

@@ -124,7 +124,6 @@ const SAShow = ref(false);
 const router = useRouter();
 const route = useRoute();
 const keyword = ref(calcMallUrlKeyword(route.path))
-
 const go_home = () => {
   window.location.href="/"
 };
@@ -151,7 +150,7 @@ getInitData()
 
 //搜索事件
 const search = () => {
-  proxy.$refs.searchInput.style.color = "rgb(153,153,153)";
+  searchInput.value.style.color = "rgb(153,153,153)";
   if (keyword.value) {
     router.push({
       path: `/goods/list/search_keyword-`+keyword.value,
@@ -198,11 +197,11 @@ const quickSearch = (val, type) => {
 };
 
 const inputFocus = () => {
-  proxy.$refs.searchInput.style.color = "#333";
-  SAShow.value = true;
-  if (keyword.value && SAList.value.length == 0) {
-    searchAssociation(keyword.value);
-  }
+  // searchInput.value.style.color = "#333";
+  // SAShow.value = true;
+  // if (keyword.value && SAList.value.length == 0) {
+  //   searchAssociation(keyword.value);
+  // }
 };
 
 const inputBlur = () => {

+ 0 - 0
xinkeaboard-web/components/UnifySearch.vue


+ 38 - 16
xinkeaboard-web/pages/goods/detail/[id].vue

@@ -73,7 +73,7 @@
                 >
                 <i> > </i>
               </span>
-              <span style="color: #333333">{{
+              <span style="font-weight: bold;font-size: 12px;color: #036EB8;">{{
                 goodsDetail.data.goodsName
               }}</span>
             </div>
@@ -99,6 +99,13 @@
                 @click="focusStore"
                 v-if="goodsDetail.data.storeInf"
               >
+                <span>
+                  {{
+                    goodsDetail.data.storeInf.isFollowStore
+                      ? L["取消关注"]
+                      : L["关注店铺"]
+                  }}
+                </span>
                 <img
                   src="/goods/collection.png"
                   alt=""
@@ -109,13 +116,7 @@
                   alt=""
                   v-show="goodsDetail.data.storeInf.isFollowStore == false"
                 />
-                <span>
-                  {{
-                    goodsDetail.data.storeInf.isFollowStore
-                      ? L["取消关注"]
-                      : L["关注店铺"]
-                  }}
-                </span>
+                
               </div>
             </div>
           </div>
@@ -258,7 +259,7 @@
               </div>
               <!-- 商品图片列表 end -->
               <!-- 商品分享和收藏 start -->
-              <div
+              <!-- <div
                 class="collection_share_btn flex_row_start_start"
                 v-if="goodsDetail.data.state == 3"
               >
@@ -279,7 +280,7 @@
                 <div class="share_btn">
                   <AddThis publicId="ra-5ab34ca22008ed41" />
                 </div>
-              </div>
+              </div> -->
               <!-- 商品分享和收藏 end -->
             </div>
             <!-- 商品图片列表 end -->
@@ -517,6 +518,28 @@
                     <div v-if="goodsDetail.data.state === 3" class="buy_now flex_row_center_center mt-20" @click="goBuy">
                       {{ L["发送询盘"] }}
                     </div>
+                    <div
+                      class="collection_share_btn flex_row_start_start mt-20"
+                      v-if="goodsDetail.data.state == 3"
+                    >
+                      <div
+                        class="collection_btn flex_row_start_center cursor_pointer"
+                        @click="collectGoods"
+                      >
+                        <img
+                          src="/goods/collection.png"
+                          alt=""
+                          v-if="goodsDetail.data.followGoods"
+                        />
+                        <img src="/goods/collection1.png" alt="" v-else />
+                        <span>{{
+                          goodsDetail.data.followGoods ? L["已收藏"] : L["收藏"]
+                        }}</span>
+                      </div>
+                      <!-- <div class="share_btn">
+                        <AddThis publicId="ra-5ab34ca22008ed41" />
+                      </div> -->
+                    </div>
                   </div>
                   <!-- 普通(活动)正常商品 end -->
 
@@ -633,26 +656,25 @@
                   </div>
                 </div>
                 <div class="store_btn flex_row_center_center">
-                  <div class="store_btn_pre flex_row_center_center">
-                    <img src="/goods/store.png" alt="" class="btn_pre_img" />
+                  <div class="store_btn_pre go_store_btn flex_row_center_center">
+                    <!-- <img src="/goods/store.png" alt="" class="btn_pre_img" /> -->
                     <router-link
                       target="_blank"
                       :to="'/store/'+ calcProductName(goodsDetail.data.storeInf.storeName) +'_'+ goodsDetail.data.storeInf.storeId"
-                      class="go_store_btn"
                     >
                       {{ L["进入店铺"] }}
                     </router-link>
                   </div>
                   <div
-                    class="store_btn_pre flex_row_center_center"
+                    class="store_btn_pre follow_btn flex_row_center_center"
                     @click="focusStore"
                   >
-                    <img
+                    <!-- <img
                       src="/goods/collection.png"
                       alt=""
                       v-if="goodsDetail.data.storeInf.isFollowStore"
                     />
-                    <img src="/goods/no_collection.png" alt="" v-else />
+                    <img src="/goods/no_collection.png" alt="" v-else /> -->
                     <span>{{
                       goodsDetail.data.storeInf.isFollowStore
                         ? L["取消关注"]

+ 1 - 1
xinkeaboard-web/pages/register.vue

@@ -26,7 +26,7 @@
     <div class="sld_login_content">
       <img
         class="bg"
-        :src="ImgBG ? ImgBG : configInfo.main_user_register_bg + ''"
+        :src="ImgBG"
         :onerror="defaultBgImg"
         alt
       />