潜客搜集版本

src/main/resources/static/css/article/article.css

@@ -337,8 +337,17 @@ dl,dd,dt{zoom:1}
 	.article-right-ross a{width: 100%;height: 100%;display: block;border-radius: 2px;}
 	.article-right-ross a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 	/*ross宣传弹窗*/
-	.ross-banner-fiexd{width: 100%;height: 260px;position: fixed;z-index: 999;background: url("/img/ross/ross-bg@1x.png")center no-repeat;left: 0;right: 0;bottom: -260px;box-sizing: border-box;padding: 0 180px;opacity: 0;}
-	.ross-banner-fiexd.active{animation: rundbottom 1s backwards;bottom: 0;opacity: 1;}
+	.ross-banner-fiexd{width: 100%;height: 260px;position: fixed;z-index: 999;background: linear-gradient(90deg, #FF5B00, #FFA86E);left: 0;right: 0;bottom: -260px;box-sizing: border-box;padding: 0 180px;opacity: 0;}
+	.ross-banner-fiexd.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
+	.ross-mssg{height: 100%;float: left;}
+	.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 80px;}
+	.ross-mssg .ross-mssg-img img{width: 260px;height: 260px;display: block;}
+	.ross-mssg .ross-mssg-text{float: left;box-sizing: border-box;padding: 30px 0;}
+	.ross-mssg .ross-mssg-text-t{margin-bottom: 60px;}
+	.ross-mssg .ross-mssg-text-b{position: relative;}
+	.ross-mssg .ross-mssg-text-b .el-icon-caret-bottom{position: absolute;top:-15px;left: 0;color: #FFFFFF;font-size: 20px;}
+	.ross-mssg .ross-mssg-text-t p{font-size: 34px;color: #FFFFFF;line-height: 50px;}
+	.ross-mssg .ross-mssg-text-b p{font-size: 18px;color: #FFFFFF;line-height: 40px;}
 	.ross-main{width: 440px;height: 100%;box-sizing: border-box;padding: 24px 40px;float: right;position: relative;}
 	.ross-close{width: 28px;height: 28px;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: 20px;right: -24px;cursor: pointer;}
 	.ross-from{width: 100%;height: auto;}
@@ -572,10 +581,19 @@ dl,dd,dt{zoom:1}
 	.listData-select-title .search-select .select-new {margin-right: 9vw;}
 
 	/*ross宣传弹窗*/
-	.ross-banner-fiexd{width: 100%;height: 113.8vw;position: fixed;z-index: 999;background: url("/img/ross/ross-bg@2x.png");left: 0;right: 0;bottom: -113.8vw;box-sizing: border-box;padding: 40vw 0 4vw 0;background-size: cover;animation: all 1s;}
+	.ross-banner-fiexd{width: 100%;height: 113.8vw;position: fixed;z-index: 999;background: linear-gradient(0deg, #FFA86E, #FF5B00);left: 0;right: 0;bottom: -113.8vw;box-sizing: border-box;padding: 4vw;background-size: cover;animation: all 1s;}
 	.ross-banner-fiexd.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
-	.ross-main{width: 100%;height: auto;box-sizing: border-box;float: right;padding: 0 7.2vw; position: relative;}
-	.ross-close{width: 6vw;height: 6vw;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: -35vw;right: 2vw;cursor: pointer;}
+	.ross-mssg{width: 100%; height: 26vw;float: left;margin-bottom: 8vw;}
+	.ross-mssg .ross-mssg-img{width: 26vw;height: 26vw;float: left;margin-right: 4vw;}
+	.ross-mssg .ross-mssg-img img{width: 26vw;height: 26vw;display: block;}
+	.ross-mssg .ross-mssg-text{width: 62vw;height: 26vw; float: left;box-sizing: border-box;}
+	.ross-mssg .ross-mssg-text-t{margin-bottom: 6vw;}
+	.ross-mssg .ross-mssg-text-b{position: relative;}
+	.ross-mssg .ross-mssg-text-b .el-icon-caret-bottom{position: absolute;top:-5vw;left: 0;color: #FFFFFF;font-size: 20px;}
+	.ross-mssg .ross-mssg-text-t p{font-size: 4vw;color: #FFFFFF;line-height: 6vw;}
+	.ross-mssg .ross-mssg-text-b p{font-size: 2.8vw;color: #FFFFFF;line-height: 4vw;}
+	.ross-main{width: 100%;height: auto;box-sizing: border-box;float: right;padding: 0 4vw; position: relative;}
+	.ross-close{width: 6vw;height: 6vw;background: url('/img/activity/pc_close.png') no-repeat;background-size: cover;position: absolute;top: -25vw;right: 0vw;cursor: pointer;}
 	.ross-from{width: 100%;height: auto;}
 	.ross-from .from-row{width: 100%;height: 12vw;float: left;margin: 2vw 0;box-sizing: border-box;}
 	.ross-from .from-row.btn{margin-top: 12vw;}
@@ -591,10 +609,7 @@ dl,dd,dt{zoom:1}
 	.ross-from .from-row .link{display: block;line-height: 12vw;font-size: 4vw;color: #FFFFFF;margin: 0 24px;}
 	.ross-from .from-row .link.left{float: left;}
 	.ross-from .from-row .link.right{float: right;}
-	@keyframes rundbottom{
-		0%{bottom: -113.8vw;opacity: 0;}
-		100%{bottom:0;opacity: 1;}
-	}
+	@keyframes rundbottom{ 0%{bottom: -113.8vw;opacity: 0;} 100%{bottom:0;opacity: 1;} }
 }
 @media screen and (min-width: 768px) {
 	.auto-input ul.auto-select-list{margin: 0;position:absolute;left:0;top:50px;width:50%;padding:8px 0;background:#fff; z-index: 999;box-shadow: 0px 6px 12px 1px rgba(0,0,0,0.1);max-height: 420px;overflow-y:auto;}

src/main/resources/static/js/article/common.js

@@ -13,13 +13,7 @@ const handleFileUrl = (id) => {
 const advertisement = new Vue({
     el: "#advertisement",
     mixins: [cmSysVitaMixins],
-    data: {
-        advertisList: [
-            'https://www.caimei365.com/img/ross/ross-image@1x.jpg',
-            'https://img.caimei365.com/group1/M00/00/A4/rB-lF2TxdE-AAOcgAAGPzubpUIU968.jpg',
-            'https://img.caimei365.com/group1/M00/04/92/rB-lGGT32GiAbNIMAANwZbKVhEE875.jpg'
-        ]
-    },
+    data: {},
     mounted() {
 
     },

src/main/resources/static/js/article/detail.js

@@ -17,8 +17,8 @@
     });
 }());
 //相关阅读
-var articleRelated = new Vue({
-    el: "#articleRelated",
+const articleContent = new Vue({
+    el: "#articleContent",
     mixins: [cmSysVitaMixins],
     data: {
         infoId: $("#articleId").val()?$("#articleId").val()*1:0,

src/main/resources/templates/article/detail.html

@@ -31,7 +31,7 @@
     </div>
 </div>
 <!--主体内容-->
-<div class="content clearfix" th:object="${article}">
+<div class="content clearfix" th:object="${article}" id="articleContent">
     <div class="mainData">
         <div class="new-list article" th:if="${article}!=null">
             <div class="title" th:text="*{title}"></div>
@@ -91,14 +91,14 @@
                     <span class="toTop icon mIcon">置顶</span>
                 </div>
             </div>
-            <!--Ross 弹窗-->
-            <template v-if="showRossHtml">
-                <template th:replace="components/ross-advert"></template>
-            </template>
         </div>
+        <!--供应商广告弹窗-->
+        <template v-if="showRossHtml">
+            <template th:replace="components/ross-advert"></template>
+        </template>
     </div>
     <!--侧边栏供应商广告图-->
-    <div v-if="isPC && shopAdvert.length > 0" class="article-right-ross article-PC" :class="shopAdvert.length > 0 ? 'show' : 'none'" id="advertisement" v-cloak>
+    <div v-if="isPC && shopAdvert.length > 0" class="article-right-ross article-PC" :class="shopAdvert.length > 0 ? 'show' : 'none'">
         <el-carousel :autoplay="true"  show-indicators="false" :height="isPC ? '343px' : '61.6vw'">
             <el-carousel-item v-for="(item, index) in shopAdvert" :key="item.id">
                 <a :href="item.jumpLink" target="_blank">
@@ -109,7 +109,6 @@
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
-
 </div>
 
 <template th:replace="article/components/article-drawer"></template>