Browse Source

商品资料库修改

喻文俊 3 years ago
parent
commit
730fc7d41f

+ 4 - 3
src/main/resources/static/css/document/beauty-archive.css

@@ -48,7 +48,8 @@ p{margin: 0}
 ::-webkit-scrollbar{width:10px;height:10px;background-color:#F6F6F6;}
 ::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.1);border-radius:2px;background-color:#F6F6F6}
 ::-webkit-scrollbar-thumb{border-radius:2px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.1);background-color:#93979F}
-body{background:#F5F5F5;color: #4A4F58;padding-top: 72px;}
+body{background:#F5F5F5;color: #4A4F58;padding-top: 72px;box-sizing: border-box;}
+#beautyArchive{min-height: 67vh}
 .cm-container{width:1200px;margin:0 auto;position: relative}
 .cm-empty{width: 100%;height: 460px; text-align: center;}
 .cm-empty.cm-empty-pc img{width: 180px;height: 180px;margin-top: 120px;}
@@ -68,7 +69,7 @@ body{background:#F5F5F5;color: #4A4F58;padding-top: 72px;}
 .cm-tabs{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;-webkit-box-align: center;-ms-flex-align: center;align-items: center;height:58px;margin-top:16px;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding-top:28px}
 .cm-tabs .cm-tab-item{padding-bottom: 6px; border-bottom:2px solid #fff;color:#4A4F58;font-size:18px;font-weight:400;cursor:pointer}
 .cm-tabs .cm-tab-item.on{border-color:#E15616;color:#E15616}
-.cm-tab-content{margin-top:16px;background:#fff}
+.cm-tab-content{margin-top:16px;background:#fff;}
 .cm-tab-content .cm-list{padding:8px 24px;-webkit-box-sizing:border-box;box-sizing:border-box}
 .cm-tab-content .cm-list .cm-section{width:1152px;padding:16px 0;border-top:1px solid #E2E7EF;cursor:pointer}
 .cm-tab-content .cm-list .cm-section.no-border{border:0}
@@ -115,7 +116,7 @@ body{color:#4A4F58;background:#fff;padding-top: 26vw;}
 .cm-empty.cm-empty-h5 img{width: 36vw;height: 36vw}
 .cm-empty.cm-empty-h5 span{display: block;font-size: 3.4vw;color: #9AA5B5;font-weight: 400;}
 /*顶部区域*/
-.cm-mobile-fixed{position: fixed;width: 100%;top: 0;background: #fff;}
+.cm-mobile-fixed{position: fixed;width: 100%;top: 0;background: #fff;z-index: 9999;}
 .cm-topbar{padding:4vw 0 3vw}
 .cm-topbar .cm-title{display:none}
 .cm-topbar .cm-search{position:relative;margin-right:3.2vw;border:1px solid #D8D8D8;border-radius:2px}

+ 2 - 0
src/main/resources/static/js/document/beauty-archive.js

@@ -1,6 +1,8 @@
 var isPC = $(window).width() > 768;
+var clientWidth = $(window).width() ;
 $(window).on('resize', function () {
     var change = $(window).width() > 768;
+    clientWidth = $(window).width();
     if (isPC === change) return;
     window.location.reload();
 });

+ 3 - 6
src/main/resources/templates/document/beauty-archive.html

@@ -27,7 +27,7 @@
             </div>
         </div>
         <!--tabs区域-->
-        <div class="cm-container cm-tabs">
+        <div class="cm-container cm-tabs" v-if="!openSearch">
             <div class="cm-tab-item" :class="{ on: currentTab === index }" v-for="(tab, index) in tabList" :key="index"
                  @click="tabClick(tab.id, index)" v-html="tab.name">
             </div>
@@ -90,13 +90,10 @@
             <img src="/img/base/loading.gif">
         </div>
     </div>
-
-    <div :class="{'cm-fixed-bottom':productList.length <= 2 }">
-        <template th:replace="document/components/beautyIndustry-footer"></template>
-    </div>
-
+<!--    :class="{'cm-fixed-bottom':productList.length <= 2 }"  -->
 </div>
 
+<template th:replace="document/components/beautyIndustry-footer"></template>
 
 <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>