商品资料库修改

src/main/resources/static/css/document/beauty-archive.css

@@ -73,7 +73,7 @@ body{background:#F5F5F5;color: #4A4F58;padding-top: 72px;box-sizing: border-box;
 .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}
-.cm-tab-content .cm-list .cm-section .cm-cover{width:120px;height:120px;border:1px solid #E1E1E1;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
+.cm-tab-content .cm-list .cm-section .cm-cover{width:120px;height:120px;border:1px solid #eee;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
 .cm-tab-content .cm-list .cm-section .cm-cover img{display:block;width:100%;height:inherit}
 .cm-tab-content .cm-list .cm-section .cm-content{width:1032px;padding-left:16px;-webkit-box-sizing:border-box;box-sizing:border-box}
 .cm-tab-content .cm-list .cm-section .cm-content .cm-title{width:100%;height:54px;margin-bottom:12px;font-size:18px;font-weight:400;line-height:1.5;color:#4A4F58;word-break:break-all;text-align: justify; display:-webkit-box;-webkit-box-orient:vertical;white-space:normal;-webkit-line-clamp:2;overflow:hidden;-webkit-transition:color .2s;-o-transition:color .2s;transition:color .2s}
@@ -109,7 +109,7 @@ body{background:#F5F5F5;color: #4A4F58;padding-top: 72px;box-sizing: border-box;
 
 /*移动端*/
 @media screen and (max-width: 768px){
-body{color:#4A4F58;background:#fff;padding-top: 26vw;}
+body{color:#4A4F58;background:#fff;}
 #meiye{margin:0 3.2vw;}
 .cm-container{position: relative}
 .cm-empty{width: 100%;margin-top: 40vw; text-align: center;}
@@ -119,7 +119,7 @@ body{color:#4A4F58;background:#fff;padding-top: 26vw;}
 .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}
+.cm-topbar .cm-search{position:relative;margin-right:3.2vw;border:1px solid #eee;border-radius:2px}
 .cm-topbar .cm-search .cm-keyword{width:93.6vw;height:9.6vw;padding:2.6vw 2.4vw;-webkit-box-sizing:border-box;box-sizing:border-box;border:0;font-size:3.4vw;color:#4A4F58}
 .cm-topbar .cm-search .cm-keyword::-webkit-input-placeholder{color:#B2B2B2}
 .cm-topbar .cm-search .cm-keyword::-moz-placeholder{color:#B2B2B2}
@@ -128,12 +128,12 @@ body{color:#4A4F58;background:#fff;padding-top: 26vw;}
 .cm-topbar .cm-search .cm-keyword::placeholder{color:#B2B2B2}
 .cm-topbar .cm-search .cm-search-btn{position:absolute;display:block;top:1.6vw;right:3.2vw;width:6.4vw;height:6.4vw;background:url(/img/info/H5-search.png) no-repeat center;background-size:6.4vw}
 /*tab切换*/
-.cm-tabs{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:10vw;padding-top:3.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;border-bottom:1px solid #D8D8D8}
+.cm-tabs{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:10vw;padding-top:3.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;border-bottom:1px solid #eee}
 .cm-tabs .cm-tab-item{padding-bottom:1.2vw;border-bottom:2px solid transparent;color:#4A4F58;font-size:4.6vw;font-weight:400}
 .cm-tabs .cm-tab-item.on{border-color:#E15616;color:#E15616}
-.cm-tab-content .cm-list .cm-section{padding:3.2vw 0;border-top:1px solid #D8D8D8}
+.cm-tab-content .cm-list .cm-section{padding:3.2vw 0;border-top:1px solid #eee}
 .cm-tab-content .cm-list{margin-top:3.2vw;padding: 0 3.2vw;}
-.cm-tab-content .cm-list .cm-section .cm-cover{width:24vw;height:24vw;border: 1px solid #E1E1E1;-webkit-box-sizing: border-box;box-sizing: border-box;}
+.cm-tab-content .cm-list .cm-section .cm-cover{width:24vw;height:24vw;border: 1px solid #eee;-webkit-box-sizing: border-box;box-sizing: border-box;}
 .cm-tab-content .cm-list .cm-section .cm-cover img{display:block;width:100%;height:100%}
 .cm-tab-content .cm-list .cm-section .cm-content{width:69vw;padding-left:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}
 .cm-tab-content .cm-list .cm-section.no-border{border:0}

src/main/resources/static/js/document/beautyArchiveDetailMixin.js

@@ -95,15 +95,17 @@ var beautyArchiveDetailMixin = {
             var suffix = file.fileName.substring(index);
             if (suffix === '.doc' || suffix === '.ppt' || suffix === '.pptx' || suffix === '.docx') {
                 // 如果是 doc 或 ppt 直接打开链接预览
-                window.open(file.htmlUrl, '_blank');
+                // window.open(file.htmlUrl, '_blank'); // 预览
+                window.open(file.fileUrl, '_black') // 下载
             } else if (suffix === '.pdf') {
                 // 如果是 pdf 需要跳转到预览页面并设置type为1，src为pdf预览链接
-                if (isPC) {
-                    window.open(file.fileUrl, '_blank');
-                } else {
-                    var url = '/document/pdfdetails.html?type=1&src=' + file.fileUrl;
-                    window.open(url, '_blank');
-                }
+                window.open(file.fileUrl, '_blank');
+                //                 // if (isPC) {
+                //     window.open(file.fileUrl, '_blank');
+                // } else {
+                //     // var url = '/document/pdfdetails.html?type=1&src=' + file.fileUrl;
+                //     window.open(file.fileUrl, '_blank');
+                // }
             } else {
                 CAIMEI.Popup({
                     content: suffix + '类型文件暂时无法预览',

src/main/resources/templates/document/beauty-archive.html

@@ -34,6 +34,7 @@
         </div>
     </div>
     <div class="cm-container cm-tab-content">
+        <div :style="{paddingTop : openSearch ? '12vw' : '26vw',}" v-if="!isPC"></div>
         <div class="cm-search-info" v-if="isPC && openSearch">为您找到相关结果<span v-html="total"></span>条</div>
         <div class="cm-list">
             <!--列表为空-->