潜客搜集版本

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

@@ -330,12 +330,12 @@ dl,dd,dt{zoom:1}
 	.like.hasDian{color:#FF5B00}
 	.dea-tag a{display:inline-block;color:#fff;height:32px;line-height:32px;padding:0 12px;background:#FF5B00;text-align:center;border-radius:4px;margin-right:15px;cursor:pointer;margin-bottom: 10px}
 	.article .like:hover{background: #ffe6dc}
-	/*ross广告图*/
-	.article-right-ross{width:284px;height:343px;float: right; background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
+	/*供应商广告图*/
+	.article-right-ross{width:284px;height:343px;float: right; text-align: center;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
 	.article-right-ross.none{display: none;}
 	.article-right-ross.show{display: block;}
-	.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;}
+	.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;}

src/main/resources/static/css/base/base.h5.css

@@ -283,10 +283,19 @@
 #globalHead{position: sticky !important; top: 0 !important; left: 0 !important; z-index: 1200;}
 
 /*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;}

src/main/resources/static/css/base/base.pc.css

@@ -505,8 +505,17 @@ iframe{width:320px !important;height: 280px !important}
 .cmbeans-alert-content-tips .tips{width: 118px;height: 24px;background-color: rgba(226, 91, 28, 0.1);border-radius: 12px;line-height: 24px;font-size: 12px;color: #FF5B00;text-align: center;}
 
 /*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{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;}

src/main/resources/static/css/index/index_new.h5.css

@@ -114,3 +114,5 @@
 .bg_icon{text-align:right;position:absolute;right:-5vw}
 .bg_icon .mIcon{width:10vw;height:10vw;display:inline-block}
 .bg_icon .mIcon:before{width:10vw;height:10vw;background-position:-33.3vw -77.3vw;cursor:pointer}
+
+ .section_right .section_right_item.ross img{width: 100%;height: 61.6vw;display: block;border-radius: 2px;}

src/main/resources/static/css/index/index_new.pc.css

@@ -167,7 +167,7 @@ li{list-style:none;}
 /*右边区域*/
 .section_right{width:284px;float:right;box-sizing:border-box;padding-top:40px}
 .section_right .section_right_item{width:284px;height:auto;background-color:#FFFFFF;float:left;margin-bottom:16px;padding:16px;box-sizing:border-box;border-radius:2px}
-.section_right .section_right_item.ross{width:284px;height:343px;background: #F3920D;color: #FFFFFF;display: none;}
+.section_right .section_right_item.ross{width:284px;height:343px;color: #FFFFFF;padding:0;}
 .section_right .section_right_item.ross.none{display: none;}
 .section_right .section_right_item.ross.show{display: block;}
 .section_right .section_right_item.ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}

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

@@ -10,8 +10,22 @@ const handleFileUrl = (id) => {
     //     window.open(fileUrl, '_blank')
     // }
 }
+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'
+        ]
+    },
+    mounted() {
 
-var articleSide = new Vue({
+    },
+    methods: {}
+});
+const articleSide = new Vue({
     el: '#articleSide',
     data: {
         typeId: 0,
@@ -19,7 +33,7 @@ var articleSide = new Vue({
         labelTxt: '',
         labelList: [],
         recommend: {},
-        adList: [],
+        adList: []
     },
     methods: {
         // getLabels: function(){
@@ -36,15 +50,15 @@ var articleSide = new Vue({
         //         }
         //     });
         // },
-        getRecommend: function(typeId, pageNum){
+        getRecommend: function (typeId, pageNum) {
             console.log(typeId, pageNum);
             var _self = this;
-            $.getJSON("/article/recommend",{
+            $.getJSON("/article/recommend", {
                 typeId: typeId,
                 pageNum: pageNum
             }, function (r) {
                 if (r.code === 0 && r.data) {
-                    _self.recommend= r.data;
+                    _self.recommend = r.data;
                 }
             });
         },
@@ -56,7 +70,7 @@ var articleSide = new Vue({
         //         }
         //     });
         // },
-        clickAD: function(id, link){
+        clickAD: function (id, link) {
             debugger;
             $.getJSON("/article/ad/click", {id: id}, function (r) {
                 window.open(link);
@@ -65,24 +79,24 @@ var articleSide = new Vue({
     },
     mounted: function () {
         const _self = this;
-        this.typeId = $("#typeId").val()*1;
-        this.labelId = $("#labelId").val()*1;
+        this.typeId = $("#typeId").val() * 1;
+        this.labelId = $("#labelId").val() * 1;
         // this.getLabels();
         if (isPC) {
             // this.getAds();
             this.getRecommend(this.typeId, 1);
             //换一批15秒请求一次
-            setInterval(function(){
+            setInterval(function () {
                 if (_self.recommend.hasNextPage) {
                     _self.getRecommend(_self.typeId, _self.recommend.nextPage);
                 } else {
                     _self.getRecommend(_self.typeId, 1);
                 }
-            },15000);
+            }, 15000);
         }
-        if (this.labelId>0) {
+        if (this.labelId > 0) {
             // 添加一个标签点击量
-            $.get("/article/label/click", {id: this.labelId}, function(res){
+            $.get("/article/label/click", {id: this.labelId}, function (res) {
                 console.log(res);
             });
         }
@@ -90,7 +104,7 @@ var articleSide = new Vue({
     }
 });
 
-var drawerFooter = new Vue({
+const drawerFooter = new Vue({
     el: "#drawer-footer",
     data: {
         recommend: [],
@@ -98,8 +112,8 @@ var drawerFooter = new Vue({
         labelId: 0,
     },
     mounted() {
-        this.typeId = $("#typeId").val()*1;
-        this.labelId = $("#labelId").val()*1;
+        this.typeId = $("#typeId").val() * 1;
+        this.labelId = $("#labelId").val() * 1;
         this.getRecommend(this.typeId, 1);
         //换一批15秒请求一次
         setInterval(() => {
@@ -108,10 +122,10 @@ var drawerFooter = new Vue({
             } else {
                 this.getRecommend(this.typeId, 1);
             }
-        },15000);
-        if (this.labelId>0) {
+        }, 15000);
+        if (this.labelId > 0) {
             // 添加一个标签点击量
-            $.get("/article/label/click", {id: this.labelId}, function(res){
+            $.get("/article/label/click", {id: this.labelId}, function (res) {
                 console.log(res);
             });
         }
@@ -121,17 +135,17 @@ var drawerFooter = new Vue({
         handlerTramp($event) {
             window.location.href = "/info/articlerecommendation.html"
         },
-        getRecommend: function(typeId, pageNum){
+        getRecommend: function (typeId, pageNum) {
             console.log(typeId, pageNum);
             var _self = this;
-            $.getJSON("/article/recommend",{
+            $.getJSON("/article/recommend", {
                 typeId: typeId,
                 pageNum: pageNum
             }, function (r) {
                 if (r.code === 0 && r.data) {
-                    _self.recommend= r.data;
+                    _self.recommend = r.data;
                 }
             });
         },
     }
-})
+});

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

@@ -1,10 +1,10 @@
-var requestUrlConfig = {
+const requestUrlConfig = {
     keyword: coreServer + "/commodity/search/query/article",
     labelId: coreServer + "/commodity/search/query/article/label",
     typeId: coreServer + "/commodity/search/query/article/type"
 };
 
-var articleList = new Vue({
+const articleList = new Vue({
     el: '#articleList',
     mixins: [cmSysVitaMixins],
     filters: {
@@ -62,8 +62,7 @@ var articleList = new Vue({
             return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
         }
     },
-    watch: {
-    },
+    watch: {},
     created: function () {
         // 判断登录状态
         var self = this;
@@ -82,20 +81,20 @@ var articleList = new Vue({
 
     methods: {
         // init auto-input complete
-        initAuthInputComplete(){
+        initAuthInputComplete() {
             new AutoComplete({
                 el: '.auto-input',
-                callback: async function(keyword){
+                callback: async function (keyword) {
                     try {
                         const res = await PublicApi.fetchQueryKeywordList({keyword: keyword});
-                        if(!res.data) return [];
+                        if (!res.data) return [];
                         return res.data.map(item => item.keyword);
                     } catch (e) {
                         console.log(e);
                     }
                 },
                 itemClick: function (keyword) {
-                    window.location.href = '/info/search-1.html?keyword='+keyword + '&linkageFlag=1';
+                    window.location.href = '/info/search-1.html?keyword=' + keyword + '&linkageFlag=1';
                 }
             });
         },
@@ -355,7 +354,7 @@ var articleList = new Vue({
             // }
         }),
         //获取更多数据
-        handleMore () {
+        handleMore() {
             if (this.params.num < this.pageTotal) { // 获取列表数据
                 if (this.requestFlag) {
                     this.params.num = this.params.num + 1;
@@ -391,21 +390,21 @@ var articleList = new Vue({
         },
 
         hanldDetails(id) {
-            window.open('/news/details.html?id='+id);
+            window.open('/news/details.html?id=' + id);
         },
         getNewList() {
-            PublicApi.GetHomeInit({ source: 1 },({ data }) => {
+            PublicApi.GetHomeInit({source: 1}, ({data}) => {
                 if (isPC) {
                     this.newsList = data.annlist
                 } else {
-                    this.newsList = data.annlist.slice(0,1)
+                    this.newsList = data.annlist.slice(0, 1)
                 }
             });
         }
     }
 });
 
-let infoNotice = new Vue({
+const infoNotice = new Vue({
     el: "#infoNotice",
     data: {
         newsList: [],
@@ -429,7 +428,7 @@ let infoNotice = new Vue({
     }
 })
 
-let searchTop = new Vue({
+const searchTop = new Vue({
     el: "#info-header",
     data: {
         show: false,

src/main/resources/static/js/index.js

@@ -15,6 +15,11 @@ var homeData = new Vue({
         hotListPageFloor:[],// 新皮橱窗
         homePageFloor:[],//楼层
         quickoperaList: [], // 快捷运营入口列表
+        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'
+        ]
     },
     filters: {
 
@@ -384,6 +389,7 @@ var homeData = new Vue({
             // 链接跳转
             if ($event.link) window.location.href = $event.link
         },
+
     },
     created: function() {
         if(GLOBAL_TOKEN){

src/main/resources/templates/article/components/article-link.html

@@ -15,5 +15,7 @@
     <link href="/lib/datapicker/daterangepicker.css" rel="stylesheet">
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="/lib/element-ui/index.css" />
+    <!--element ui 样式表-->
+    <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css"/>
+    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
 

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

@@ -97,9 +97,15 @@
             </template>
         </div>
     </div>
-    <!--侧边栏Ross广告图-->
-    <div v-if="isPC && isRossShow" class="article-right-ross article-PC" :class="isRossShow ? 'show' : 'none'">
-        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+    <!--侧边栏供应商广告图-->
+    <div v-if="isPC && isRossShow" class="article-right-ross article-PC" :class="isRossShow ? 'show' : 'none'" id="advertisement" v-cloak>
+        <el-carousel :autoplay="true" :height="isPC ? '343px' : '61.6vw'">
+            <el-carousel-item v-for="(item, index) in advertisList" :key="item">
+                <a href="/supplier-1378.html" v-if="isPC">
+                    <img :src="item" alt="">
+                </a>
+            </el-carousel-item>
+        </el-carousel>
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>

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

@@ -91,7 +91,6 @@
                     </div>
                 </div>
             </div>
-            <div v-if="!isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'"><a href="/supplier-1378.html" ><img src="/img/ross/ross-image@2x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a></div>
             <!-- 产品搜索结果 -->
             <div class="search-section" v-show="params.keyword && productRecord > 0">
                 <div class="search__product_list">
@@ -218,9 +217,15 @@
             </ul>
         </div>
     </div>
-    <!--侧边栏Ross广告图-->
-    <div v-if="isPC && isRossShow" class="article-right-ross article-PC" :class="isRossShow ? 'show' : 'none'">
-        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+    <!--侧边栏供应商广告图-->
+    <div v-if="isPC && isRossShow" class="article-right-ross article-PC" :class="isRossShow ? 'show' : 'none'" id="advertisement" v-cloak>
+        <el-carousel :autoplay="true" :height="isPC ? '343px' : '61.6vw'">
+            <el-carousel-item v-for="(item, index) in advertisList" :key="item">
+                <a href="/supplier-1378.html" v-if="isPC">
+                    <img :src="item" alt="">
+                </a>
+            </el-carousel-item>
+        </el-carousel>
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>

src/main/resources/templates/components/ross-advert.html

@@ -2,6 +2,21 @@
 <div class="other" id="rossAdvert" v-cloak>
   <!--Ross广告图-->
   <div class="ross-banner-fiexd" :class="showRossHtml ? 'active' : ''">
+    <div class="ross-mssg">
+      <div class="ross-mssg-img">
+        <img src="https://img.caimei365.com/group1/M00/00/55/rB-lF2MMhUWAC7vAAAGQFrJJQrw679.jpg" alt="">
+      </div>
+      <div class="ross-mssg-text">
+        <div class="ross-mssg-text-t">
+          <p>对西班牙Ross品牌感兴趣？</p>
+          <p>西班牙Ross商品</p>
+        </div>
+        <div class="ross-mssg-text-b">
+          <i class="el-icon-caret-bottom"></i>
+          <p>请留下您的姓名和手机号，采美会安排咨询顾问联系您!</p>
+        </div>
+      </div>
+    </div>
     <div class="ross-main">
       <div class="ross-from">
         <div class="from-row">

src/main/resources/templates/index.html

@@ -103,9 +103,12 @@
         <div class="inner">
             <div id="sidebar" class="section_right">
                 <div class="box" >
-                    <div class="section_right_item ross" v-if="isRossShow" :class="isRossShow ? 'show' : 'none'">
-                        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-                        <a href="/supplier-1378.html" v-else><img src="/img/ross/ross-image@3x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+                    <div class="section_right_item ross">
+                        <el-carousel :autoplay="true" :height="isPC ? '343px' : '61.6vw'">
+                            <el-carousel-item v-for="(item, index) in advertisList" :key="item">
+                                <img :src="item" alt="">
+                            </el-carousel-item>
+                        </el-carousel>
                     </div>
                     <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
                         <div class="right_item_title">

src/main/resources/templates/product/instrument.html

@@ -17,10 +17,6 @@
             <input type="hidden" th:value="${typeFloorJson.get('contentLabel')}" id="contentLabel">
         </th:block>
         <div class="instrue-right-content">
-            <div class="instrue-right-ross" v-if="isRossShow" :class="isRossShow ? 'show' : 'none'">
-                <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-                <a href="/supplier-1378.html" v-else><img src="/img/ross/ross-image@2x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-            </div>
             <div class="instrue-right" th:if="${typeFloorJson.get('hotSearchList')}!=null and ${typeFloorJson.get('hotSearchList').size}>0">
                 <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
                 <div v-if="isPC" class="hot-search">