Bladeren bron

Ross精准用户搜集

zhengjinyi 2 jaren geleden
bovenliggende
commit
f51a9cad6f
29 gewijzigde bestanden met toevoegingen van 329 en 49 verwijderingen
  1. 48 1
      src/main/resources/static/css/article/article.css
  2. 23 2
      src/main/resources/static/css/base/base.h5.css
  3. 17 5
      src/main/resources/static/css/base/base.pc.css
  4. 2 0
      src/main/resources/static/css/base/floor.css
  5. 4 14
      src/main/resources/static/css/index/index_new.pc.css
  6. 10 2
      src/main/resources/static/css/product/instruement.css
  7. BIN
      src/main/resources/static/img/ross/ross-bg@1x.png
  8. BIN
      src/main/resources/static/img/ross/ross-bg@2x.png
  9. BIN
      src/main/resources/static/img/ross/ross-image@1x.jpg
  10. BIN
      src/main/resources/static/img/ross/ross-image@2x.jpg
  11. BIN
      src/main/resources/static/img/ross/ross-image@3x.jpg
  12. 1 0
      src/main/resources/static/js/article/common.js
  13. 1 1
      src/main/resources/static/js/article/detail.js
  14. 33 0
      src/main/resources/static/js/common/serviceapi/utils.service.js
  15. 101 3
      src/main/resources/static/js/mixins/cmSysMixins.js
  16. 1 1
      src/main/resources/static/js/product/detail.js
  17. 1 1
      src/main/resources/static/js/product/list.js
  18. 2 1
      src/main/resources/static/js/supplier/index.js
  19. 1 1
      src/main/resources/static/js/supplier/list.js
  20. 4 0
      src/main/resources/templates/article/components/article-sidebar.html
  21. 6 1
      src/main/resources/templates/article/detail.html
  22. 4 0
      src/main/resources/templates/article/list.html
  23. 27 0
      src/main/resources/templates/components/ross-advert.html
  24. 4 0
      src/main/resources/templates/index.html
  25. 4 0
      src/main/resources/templates/product/detail.html
  26. 22 16
      src/main/resources/templates/product/instrument.html
  27. 4 0
      src/main/resources/templates/product/list.html
  28. 5 0
      src/main/resources/templates/supplier/index.html
  29. 4 0
      src/main/resources/templates/supplier/list.html

+ 48 - 1
src/main/resources/static/css/article/article.css

@@ -231,6 +231,26 @@ dl,dd,dt{zoom:1}
 	.like.hasDian{color:#e15616}
 	.dea-tag a{display:inline-block;color:#fff;height:32px;line-height:32px;padding:0 12px;background:#e15616;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;background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
+	.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-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;}
+	.ross-from .from-row{width: 100%;height: 40px;float: left;margin: 12px 0;box-sizing: border-box;}
+	.ross-from .from-row.none{margin: 0;padding-left: 60px;}
+	.ross-from .from-row .label{width: 60px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: right;padding-right: 5px;box-sizing: border-box;}
+	.ross-from .from-row .input{width: 300px;height: 40px;float: left;border-radius: 2px; border: none; line-height: 40px;font-size: 14px;color: #202020;box-sizing: border-box;padding: 0 10px;background: #FFFFFF;}
+	.ross-from .from-row .from-btn{width: 300px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+	.ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
+	.ross-from .from-row .link{display: block;line-height: 28px;font-size: 14px;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: -260px;opacity: 0;} 100%{bottom:0;opacity: 1;} }
 
 }
 @media screen and (max-width:768px){
@@ -369,6 +389,33 @@ dl,dd,dt{zoom:1}
 	.classify{height:10vw;line-height:10vw;border-left:solid 4px #e15616;font-size:3.7vw;color:#333;padding:0 3vw;background:#fff}
 	.article .like{color: #e15616;cursor: pointer;display: block;height: 18.4vw;width: 18.4vw;line-height: 27.4vw;margin: 5vw auto;border-radius: 50%;background: #fef6f3;text-align: center;position: relative}
 	.article .like:before{ width: 8vw;height: 8vw;background-position: -14vw -78.4vw;vertical-align: middle;border-radius: 50%;position: absolute;top: 3.2vw}
-
 	.no-result{text-align: center;padding: 3.2vw 0;}
+	/*ross 广告图*/
+	.article-right-ross{width:100%;height:26vw;float: left; border-radius: 2px;float: left;margin-bottom: 3vw;box-sizing: border-box;padding: 0 3vw;}
+	.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: 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.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-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;}
+	.ross-from .from-row.none{margin: 0;}
+	.ross-from .from-row .label{display: none;}
+	.ross-from .from-row .input{width: 100%;height: 12vw;background: none;float: left;border: none; line-height:12vw;font-size: 4vw;color: #FFFFFF;box-sizing: border-box;border-bottom: 1px solid #FFFFFF;}
+	.ross-from .from-row .input::-webkit-input-placeholder{ color:#FFFFFF;}
+	.ross-from .from-row .input::-moz-input-placeholder{ color:#FFFFFF;}
+	.ross-from .from-row .input::-ms-input-placeholder{ color:#FFFFFF;}
+	.ross-from .from-row .input::input-placeholder{ color:#FFFFFF;}
+	.ross-from .from-row .from-btn{width: 100%;height: 12vw;float: left;line-height: 12vw;font-size: 4vw;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+	.ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
+	.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;}
+	}
 }

+ 23 - 2
src/main/resources/static/css/base/base.h5.css

@@ -189,7 +189,7 @@
 .loginAlert:before{content:'';display:block;width:26.7vw;height:26.7vw;background:url(/img/account/to_login_m.png) no-repeat left top;background-size:100% 100%;margin:0 auto}
 .jconfirm .jconfirm-box .jconfirm-buttons button{font-size:3.4vw!important;}
 /* 咨询,回到顶部 */
-#scrollTop{display:none;position:fixed;right:3.2vw;z-index:9999;bottom:4vw;}
+#scrollTop{display:none;position:fixed;right:3.2vw;z-index:99;bottom:4vw;}
 #scrollTop .item{width:15vw;background-color:rgba(190,194,201,.3);box-sizing:border-box;text-align:center;margin-bottom:2.5vw;font-size:3vw;position:relative;border-radius: 0.2vw;}
 #scrollTop .item>span{box-sizing:border-box;display:block;padding:1.5vw;line-height:3.4vw;}
 #scrollTop .item .phone,#scrollTop .item .toTop{width:100%;height:100%;}
@@ -253,5 +253,26 @@
 .cmbeans-alert-content-bean .icon-text{font-weight: bold;}
 .cmbeans-alert-content-tips{width: 100%;height: 5.6vw;line-height: 5.6vw;margin-top: 4vw;box-sizing: border-box;display: flex;flex-direction: column;align-items: center;}
 .cmbeans-alert-content-tips .tips{width: 27.2vw;height: 5.6vw;background-color: rgba(226, 91, 28, 0.1);border-radius: 2.8vw;line-height: 5.6vw;font-size: 2.6vw;color: #E15616;text-align: center;padding: 0 1.2vw;}
-
 #globalHead{position: sticky !important; top: 0 !important; left: 0 !important; z-index: 9999;}
+
+/*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.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-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;}
+.ross-from .from-row.none{margin: 0;}
+.ross-from .from-row .label{display: none;}
+.ross-from .from-row .input{width: 100%;height: 12vw;background: none;float: left;border: none; line-height:12vw;font-size: 4vw;color: #FFFFFF;box-sizing: border-box;border-bottom: 1px solid #FFFFFF;}
+.ross-from .from-row .input::-webkit-input-placeholder{ color:#FFFFFF;}
+.ross-from .from-row .input::-moz-input-placeholder{ color:#FFFFFF;}
+.ross-from .from-row .input::-ms-input-placeholder{ color:#FFFFFF;}
+.ross-from .from-row .input::input-placeholder{ color:#FFFFFF;}
+.ross-from .from-row .from-btn{width: 100%;height: 12vw;float: left;line-height: 12vw;font-size: 4vw;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+.ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
+.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;} }

+ 17 - 5
src/main/resources/static/css/base/base.pc.css

@@ -315,7 +315,7 @@ iframe{width:320px !important;height: 280px !important}
 .loginAlert span:first-child:after{content: ',';}
 .loginAlert:after{content:'';display:block;width:125px;height:125px;background:url(/img/account/to_login.png) no-repeat left top;background-size:100% 100%;margin:10px 0 0 15px;}
 /* 咨询,回到顶部 */
-#scrollTop{display:none;position:fixed;right:0;margin-right:0;width:88px;z-index:9999;bottom:80px;}
+#scrollTop{display:none;position:fixed;right:0;margin-right:0;width:88px;z-index:9999;bottom:300px;}
 #scrollTop .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}
 #scrollTop .item>span{display:block;width:94px;box-sizing:border-box;position:relative;cursor:pointer;white-space:pre-wrap;word-break:break-all;}
 #scrollTop .item>span:hover{color:#E15616;}
@@ -378,10 +378,22 @@ iframe{width:320px !important;height: 280px !important}
 .cmbeans-alert-content-tips{width: 100%;height: 24px;line-height: 24px;margin-top: 20px;box-sizing: border-box;display: flex;flex-direction: column;align-items: center;}
 .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: #E15616;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.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
+.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;}
+.ross-from .from-row{width: 100%;height: 40px;float: left;margin: 12px 0;box-sizing: border-box;}
+.ross-from .from-row.none{margin: 0;padding-left: 60px;}
+.ross-from .from-row .label{width: 60px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: right;padding-right: 5px;box-sizing: border-box;}
+.ross-from .from-row .input{width: 300px;height: 40px;float: left;border-radius: 2px; border: none; line-height: 40px;font-size: 14px;color: #202020;box-sizing: border-box;padding: 0 10px;background: #FFFFFF;}
+.ross-from .from-row .from-btn{width: 300px;height: 40px;float: left;line-height: 40px;font-size: 14px;color: #FFFFFF;text-align: center;background: #202020;cursor: pointer;}
+.ross-from .from-row .from-btn.disabled{background: #CBCBCB;}
+.ross-from .from-row .link{display: block;line-height: 28px;font-size: 14px;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: -260px;opacity: 0;} 100%{bottom:0;opacity: 1;} }
 
 
 

+ 2 - 0
src/main/resources/static/css/base/floor.css

@@ -142,6 +142,8 @@
 .section_right{padding:3.2vw}
 .box{white-space:nowrap;overflow-x:auto}
 .section_right .section_right_item{display:inline-block;width:42.2vw;height:61.6vw;background:#fff;margin-right:2.4vw;flex-shrink:0;vertical-align: top;}
+.section_right .section_right_item>a{width: 100%;height: 100%;display: block;border-radius: 2px;}
+.section_right .section_right_item>a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .section_right .right_item_title{overflow:hidden;padding:2.4vw}
 .section_right .right_item_title p{float:left;font-size:3.4vw;font-weight:bold;color:#4a4f58;text-align:left}
 .section_right .right_item_title a{display:inline-block;float:right;font-size:3.2vw;color:#909090;text-align:right}

+ 4 - 14
src/main/resources/static/css/index/index_new.pc.css

@@ -20,20 +20,7 @@ li{list-style:none;}
 #swiper-container .swiper-pagination span{display:inline-block;border:5px solid transparent;cursor:pointer}
 #swiper-container .swiper-pagination span:before{content:"";display:inline-block;width:14px;height:4px;background:rgba(255,255,255,.4);border-radius:2px}
 #swiper-container .swiper-pagination span.on:before{width:28px;background:#fff}
-.swiper-slide {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    -webkit-justify-content: center;
-    justify-content: center;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    -webkit-align-items: center;
-    align-items: center;
-}
+.swiper-slide {display: -webkit-box;display: -ms-flexbox;display: -webkit-flex;display: flex;-webkit-box-pack: center;-ms-flex-pack: center;-webkit-justify-content: center;justify-content: center;-webkit-box-align: center;-ms-flex-align: center;-webkit-align-items: center;align-items: center;}
 /*公告*/
 #new-container{height: 48px;background: url("/img/base/icon-newbg@2x.png");background-size: cover;}
 #new-container .new-list{float: left;}
@@ -53,6 +40,9 @@ 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;}
+.section_right .section_right_item.ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}
+.section_right .section_right_item.ross>a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .section_right .section_right_item.fixed{position:fixed;top:200px;width:284px;}
 .section_right .right_item_title{width:100%;height:22px;line-height:22px;float:left;margin-bottom:8px}
 .section_right .right_item_title p{float:left;font-size:16px;font-weight:bold;color:#4a4f58;text-align:left}

+ 10 - 2
src/main/resources/static/css/product/instruement.css

@@ -3,11 +3,15 @@
     .instrue-left {width: 900px;float: left;}
     .normal-nav{margin-top: 10px}
     .top-category{overflow: hidden;}
+    .instrue-right-content{width: 284px;min-height: 343px;float: right;margin-top: 10px;}
+    .instrue-right-ross{width:284px;height:343px;background: #F3920D;text-align: center;border-radius: 2px;float: left;margin-bottom: 16px;}
+    .instrue-right-ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}
+    .instrue-right-ross>a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
     .instrue-left .top-category .normal-nav .nav-list:hover{color:#e15616;transform:translateY(-5px);box-shadow:0 8px 8px rgba(102,102,102,0.05), 0 10px 10px rgba(102,102,102,0.05), 0 12px 12px rgba(102,102,102,0.05);}
     .instrue-left .top-category .normal-nav .nav-list {border:1px solid #fff;float: left;margin: 0 16px 16px 0;width: 132px;height: 88px;background: #fff;text-align: center;color: #4a4f58;font-size: 14px;cursor: pointer;transition: all 0.4s}
     .instrue-left .top-category .normal-nav .nav-list a{padding: 0 10px;text-align: center;display: block;line-height: 22px;}
     .instrue-left .top-category .normal-nav .nav-list.active {border: 1px solid #e15616;color: #e15616;}
-    .instrue-right {float: right;width: 252px;background: #fff;padding: 16px;margin-top: 10px;min-height: 343px;overflow: auto;}
+    .instrue-right {float: left;width: 252px;background: #fff;padding: 16px;margin-top: 10px;min-height: 343px;overflow: auto;}
     .instrue-right .wrap_tittle{padding-bottom: 10px;color: #4a4f58;font-size: 16px;font-weight: bold;border-bottom: 1px solid #f5f5f5;position: relative;}
     .instrue-right .wrap_tittle .line{height: 2px;width: 16px;background: #e15616;display: block;position: absolute;bottom: 0}
     .instrue-right .hot-search{padding:24px 0px 0px 0px;}
@@ -21,7 +25,11 @@
 
 
 @media screen and (max-width:768px) {
-    .instrue-right{width: 100%;background: #fff;padding-top:3.2vw;position:relative;}
+    .instrue-right-content{width: 100%;padding:3.2vw;box-sizing: border-box;}
+    .instrue-right-ross{width:100%;height:26vw;background: #F3920D;text-align: center;border-radius: 2px;float: left;margin-bottom: 3vw;}
+    .instrue-right-ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}
+    .instrue-right-ross>a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
+    .instrue-right{width: 100%;background: #fff;position:relative;float: left;}
     .instrue-right .wrap_tittle{padding: 0 3.2vw;color: #909090; font-size: 3.4vw;}
     .instrue-right .hot-search{padding: 2.7vw;overflow: hidden;height: 7vw;background: #fff;border-radius: 0 0 1.6vw 1.6vw;}
     .instrue-right .hot-search .hot-list{display: inline-block;background: #f7f7f7;color: #4a4f58;font-size: 3.2vw;padding: .7vw 2vw;margin: 0 2.4vw 3.1vw 0;position: relative;}

BIN
src/main/resources/static/img/ross/ross-bg@1x.png


BIN
src/main/resources/static/img/ross/ross-bg@2x.png


BIN
src/main/resources/static/img/ross/ross-image@1x.jpg


BIN
src/main/resources/static/img/ross/ross-image@2x.jpg


BIN
src/main/resources/static/img/ross/ross-image@3x.jpg


+ 1 - 0
src/main/resources/static/js/article/common.js

@@ -1,6 +1,7 @@
 /*var articleTypeNav = new Swiper('#articleTypeNav');*/
 var articleSide = new Vue({
     el: '#articleSide',
+    mixins: [cmSysVitaMixins],
     data: {
         typeId: 0,
         labelId: 0,

+ 1 - 1
src/main/resources/static/js/article/detail.js

@@ -47,7 +47,7 @@ var articleRelated = new Vue({
         })
         this.cmSysParams.pageType = 11;
         this.cmSysParams.pageLabel =  pageLabelArray.join('/');
-        this.infoId = $("#articleId").val() ? $("#articleId").val()*1 : 0;
+        this.infoId = this.handlearticleId = $("#articleId").val() ? $("#articleId").val()*1 : 0;
         this.articleLabels = $("#articleLabels").val()?$("#articleLabels").val():"";
         // 获取相关阅读
         // this.getRelatedList();

+ 33 - 0
src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -592,6 +592,39 @@ var PublicApi = {
                 callback(res);
             });
         },
+        userInformationIsClick: function (params, callback) {//查看用户是否有过弹框,游客当天是否有过弹框
+            Http.AjaxService({
+                url: '/user/information/isClick',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            }).then(function (res) {
+                callback(res);
+            });
+        },
+        userInformationInsertRoos: function (params, callback) {//插入填写咨询人基本信息
+            Http.AjaxService({
+                url: '/user/information/insertRoos',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            }).then(function (res) {
+                callback(res);
+            });
+        },
+        userInformationVisitRoos: function (params, callback) {//查看访问者是否浏览过roos相关页面
+            Http.AjaxService({
+                url: '/user/information/visitRoos',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            }).then(function (res) {
+                callback(res);
+            });
+        },
 
 };
 

+ 101 - 3
src/main/resources/static/js/mixins/cmSysMixins.js

@@ -12,10 +12,33 @@ var cmSysVitaMixins = function () {
                     pageType:'',//页面类型
                     pageLabel:'',//页面标签
                     userId:0,//用户Id
-                    productId:0//商品Id
-                }
+                    productId:0,//商品Id
+                    behaviorType:1 // 用户行为类型
+                },
+                handleProsId:0,
+                handleShopId:0,
+                handlearticleId:0,
+                handleProsKey:"",
+                handleShopKey:"",
+                productIds:[6946,6947,6953,6953,6954,6955,6956,6957,6958],//Ross 商品ID集合
+                // productIds:[7247,7248],//Ross 商品ID集合
+                shopIds:[10131],// Ross 供应商Id
+                // shopIds:[1378],// Ross 供应商Id
+                articleIds:[6610,6611,6612,6613,6614,6615,6616,6617,6618,6619,6620],//Ross 相关文章ID 集合
+                // articleIds:[7184,7199,7531,7497,7471,7458,7440,7424,7398,7370,7356,7344,7300,7298,7232,6674],//Ross 相关文章ID 集合
+                keyWords:['Binary Premium','智能体疗管理系统','448k','肌肉重塑疗法','西班牙ROSS','ROSS','智能体疗'],// Ross 搜索商品关键词 集合
+                shopKeyWords:['深圳艾斯佰丽生物科技有限公司','艾斯佰丽'],
+                showRossHtml:false,
+                consultParams:{
+                    ip:'',
+                    createTime:'',
+                    consultMobile: '',
+                    consultName: '',
+                    isClick:1
+                },
+                isDisabled:true,
+                isRossShow:false
             }
-
         },
         methods: {
             setTime() {
@@ -23,6 +46,18 @@ var cmSysVitaMixins = function () {
                 let _self = this;
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
                 if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
+                console.log('handlearticleId',this.handlearticleId)
+                if( this.productIds.includes(this.handleProsId*1) ||
+                    this.shopIds.includes(this.handleShopId*1) ||
+                    this.articleIds.includes(this.handlearticleId*1) ||
+                    this.keyWords.includes(this.handleProsKey) ||
+                    this.shopKeyWords.includes(this.handleShopKey)
+                ){
+                    this.cmSysParams.behaviorType = 2;
+                    if (!GLOBAL_USER_ID>0) {
+                        this.userInformationIsClick()
+                    }
+                }
                 this.cmSysParams.pagePath = window.location.href;
                 this.clearTimeSet = setInterval(() => {
                     _self.browseTime++;
@@ -53,6 +88,67 @@ var cmSysVitaMixins = function () {
                     1:window.removeEventListener(map[isBrowser], e => this.beforeunloadHandler(e)) // 接触绑定
                 }
                 return FunMap[type];
+            },
+            handleInputName(e){
+                this.consultParams.consultName = e.target.value;
+                this.handldeCheckInput();
+            },
+            handleInputPhone(e){
+                this.consultParams.consultMobile = e.target.value;
+                this.handldeCheckInput();
+            },
+            handldeCheckInput(){
+                if(this.consultParams.consultName !== "" && this.consultParams.consultMobile !==""){
+                    this.isDisabled =false;
+                }else{
+                    this.isDisabled =true;
+                }
+            },
+            handleSubmit(){
+                // 提交联系人信息
+                if(this.isDisabled){ return }
+                this.userInformationInsertRoos(this.consultParams);
+            },
+            handleClose(){
+                // 关闭Ross 广告弹窗
+                this.userInformationInsertRoos(this.consultParams);
+            },
+            userInformationIsClick(){
+                //查询是否需要弹Ross广告
+                let _self = this;
+                PublicApi.userInformationIsClick({}, function (response) {
+                    if(response.code == 0){
+                        if(response.data){
+                            setTimeout(()=>{
+                                _self.showRossHtml = true
+                            },5000)
+                        }
+                    }else{
+                        console.log('error',response.msg);
+                    }
+                })
+            },
+            userInformationInsertRoos(params){
+                //提交记录咨询人&&关闭弹窗
+                let _self = this;
+                PublicApi.userInformationInsertRoos(params, function (response) {
+                    if(response.code == 0){
+                        _self.showRossHtml = false
+                    }else{
+                        console.log('error',response.msg);
+                    }
+                })
+            },
+            userInformationVisitRoos(params){
+                //查看访问者是否浏览过roos相关页面
+                let _self = this;
+                PublicApi.userInformationVisitRoos(params, function (response) {
+                    if(response.code == 0){
+                        _self.isRossShow = response.data
+                    }else{
+                        console.log('error',response.msg);
+                    }
+                })
             }
         },
         mounted() {
@@ -60,6 +156,8 @@ var cmSysVitaMixins = function () {
             this.setTime();
             // 绑定窗口[监听]事件
             this.handleWindow(0)
+            // 查看访问者是否浏览过roos相关页面
+            this.userInformationVisitRoos({ userId: this.cmSysParams.userId })
         },
         destroyed() {
             // 解除窗口关闭[监听]事件

+ 1 - 1
src/main/resources/static/js/product/detail.js

@@ -830,7 +830,7 @@ var productDetail = new Vue({
         },
     },
     created: function () {
-        this.productId = this.couponParam.productId = this.listQuery.productId = $("#productId").val();
+        this.productId = this.couponParam.productId = this.listQuery.productId = this.handleProsId = $("#productId").val();
         this.cmSysParams.pageType = 6;
         this.cmSysParams.productId = this.productId;
         this.typeId = $("#typeId").val();

+ 1 - 1
src/main/resources/static/js/product/list.js

@@ -328,7 +328,7 @@ var productList = new Vue({
         }
         this.params.keyword = this.brandParam.keyword = getUrlParam("keyword") ? getUrlParam("keyword") : "";
         this.cmSysParams.pageType = 8;
-        this.cmSysParams.pageLabel = this.params.keyword;
+        this.cmSysParams.pageLabel = this.handleProsKey = this.params.keyword;
         // 搜索框赋值
         $('#topSearch').find('[data-select]').attr("data-select", 0).text("产品");
         $('#topSearch').find('.jqSelect').find('select').val(0);

+ 2 - 1
src/main/resources/static/js/supplier/index.js

@@ -1,5 +1,6 @@
 var supplierHome = new Vue({
     el: "#supplierHome",
+    mixins: [cmSysVitaMixins],
     data: {
         requestFlag: true,
         userId: 0,
@@ -212,7 +213,7 @@ var supplierHome = new Vue({
     created: function () {
         // this.params.id = getUrlParam("id") ? getUrlParam("id") * 1 : 0;
         var paramsArr = window.location.pathname.split(".")[0].split("-");
-        this.params.id =  paramsArr.length>=1 ? paramsArr[1]*1 : 0;
+        this.params.id = this.handleShopId =  paramsArr.length>=1 ? paramsArr[1]*1 : 0;
         if(this.params.id !== 0) {
             this.getShopInfo();
             this.getBanners();

+ 1 - 1
src/main/resources/static/js/supplier/list.js

@@ -96,7 +96,7 @@ var supplierList = new Vue({
         }
         this.params.keyword = getUrlParam("keyword") ? getUrlParam("keyword") : "";
         this.cmSysParams.pageType = 9;
-        this.cmSysParams.pageLabel = this.params.keyword;
+        this.cmSysParams.pageLabel = this.handleShopKey = this.params.keyword;
         // 搜索框赋值
         $('#topSearch').find('[data-select]').attr("data-select", 1).text("供应商");
         $('#topSearch').find('.jqSelect').find('select').val(1);

+ 4 - 0
src/main/resources/templates/article/components/article-sidebar.html

@@ -1,5 +1,9 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <div class="other" id="articleSide" v-cloak>
+    <!--侧边栏Ross广告图-->
+    <div v-if="isPC && isRossShow" class="article-right-ross">
+        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+    </div>
     <div id="mHotWord">
         <div class="tags clearfix">
             <p class="classify">

+ 6 - 1
src/main/resources/templates/article/detail.html

@@ -81,16 +81,21 @@
                     <span class="toTop icon mIcon">置顶</span>
                 </div>
             </div>
+            <!--Ross 弹窗-->
+            <template v-if="showRossHtml">
+                <template th:replace="components/ross-advert"></template>
+            </template>
         </div>
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
+
 </div>
 <template th:replace="article/components/article-footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.qrcode.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/detail.js(v=${version})}"></script>
 </body>
 </html>

+ 4 - 0
src/main/resources/templates/article/list.html

@@ -19,8 +19,11 @@
 </div>
 <!--主体内容-->
 <div class="content clearfix" id="ArticleContent">
+    <!--侧边栏Ross广告图-->
+
     <div class="mainData">
         <div class="new-list" id="articleList" v-cloak>
+            <div v-if="!isPC && isRossShow" class="article-right-ross"><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">
@@ -130,6 +133,7 @@
 <script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
 </body>

+ 27 - 0
src/main/resources/templates/components/ross-advert.html

@@ -0,0 +1,27 @@
+<html xmlns:th="http://www.w3.org/1999/xhtml">
+<div class="other" id="rossAdvert" v-cloak>
+  <!--Ross广告图-->
+  <div class="ross-banner-fiexd" :class="showRossHtml ? 'active' : ''">
+    <div class="ross-main">
+      <div class="ross-from">
+        <div class="from-row">
+          <div class="label">姓名:</div>
+          <input class="input" type="text" value="" v-model="consultParams.consultName" @input="handleInputName" maxlength="10" placeholder="您的姓名">
+        </div>
+        <div class="from-row">
+          <div class="label">手机号:</div>
+          <input class="input" type="text" value="" v-model="consultParams.consultMobile" @input="handleInputPhone"  maxlength="11" placeholder="您的手机号">
+        </div>
+        <div class="from-row btn">
+          <div class="label"></div>
+          <div class="from-btn" :class="isDisabled ? 'disabled' : ''" @click="handleSubmit">提交</div>
+        </div>
+        <div class="from-row none">
+          <a class="link left" href="/register.html">立即注册</a>
+          <a class="link right" href="/login.html">登录</a>
+        </div>
+      </div>
+      <div class="ross-close" @click="handleClose"></div>
+    </div>
+  </div>
+</div>

+ 4 - 0
src/main/resources/templates/index.html

@@ -54,6 +54,10 @@
         <div class="inner">
             <div id="sidebar" class="section_right">
                 <div class="box" >
+                    <div class="section_right_item ross" v-if="isRossShow">
+                        <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>
                     <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
                         <div class="right_item_title">
                             <p>精彩直播</p>

+ 4 - 0
src/main/resources/templates/product/detail.html

@@ -760,6 +760,10 @@
             </div>
         </template>
     </div>
+    <!--Ross 弹窗-->
+    <template v-if="showRossHtml">
+        <template th:replace="components/ross-advert"></template>
+    </template>
 </div>
 
 <!-- 引入底部 -->

+ 22 - 16
src/main/resources/templates/product/instrument.html

@@ -16,30 +16,36 @@
         <th:block th:if="${typeFloorJson.get('contentLabel')}!=null" th:object="${typeFloorJson}">
             <input type="hidden" th:value="${typeFloorJson.get('contentLabel')}" id="contentLabel">
         </th:block>
-        <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">
-                <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
-                    <a class="hot-list" th:href="*{link}">
-                        <i th:class="*{isHot}=='1'?'icon hot':'icon'"></i>
-                        <template th:text="*{name}"></template>
-                    </a>
-                </th:block>
+        <div class="instrue-right-content">
+            <div class="instrue-right-ross" v-if="isRossShow">
+                <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 v-else class="hot-search" :style="showflag?'height:auto':''">
-                <div class="left-box">
+            <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">
                     <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
                         <a class="hot-list" th:href="*{link}">
-                        <i th:class="*{isHot}=='1'?'mIcon hot':'mIcon'"></i>
-                        <template th:text="*{name}"></template>
+                            <i th:class="*{isHot}=='1'?'icon hot':'icon'"></i>
+                            <template th:text="*{name}"></template>
                         </a>
                     </th:block>
                 </div>
-                <div class="right-box" @click="showNav">
-                    <span class="mIcon" :class="showflag?'close':'open'"></span>
+                <div v-else class="hot-search" :style="showflag?'height:auto':''">
+                    <div class="left-box">
+                        <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
+                            <a class="hot-list" th:href="*{link}">
+                                <i th:class="*{isHot}=='1'?'mIcon hot':'mIcon'"></i>
+                                <template th:text="*{name}"></template>
+                            </a>
+                        </th:block>
+                    </div>
+                    <div class="right-box" @click="showNav">
+                        <span class="mIcon" :class="showflag?'close':'open'"></span>
+                    </div>
                 </div>
+                <div :class="showflag?'bg':''" @click="closeup"></div>
             </div>
-            <div :class="showflag?'bg':''" @click="closeup"></div>
         </div>
         <div class="instrue-left">
             <div class="top-category">

+ 4 - 0
src/main/resources/templates/product/list.html

@@ -231,6 +231,10 @@
         <span>页</span>&nbsp;
         <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
     </div>
+    <!--Ross 弹窗-->
+    <template v-if="showRossHtml">
+        <template th:replace="components/ross-advert"></template>
+    </template>
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>

+ 5 - 0
src/main/resources/templates/supplier/index.html

@@ -184,12 +184,17 @@
             </div>
         </div>
     </div>
+    <!--Ross 弹窗-->
+    <template v-if="showRossHtml">
+        <template th:replace="components/ross-advert"></template>
+    </template>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/index.js(v=${version})}"></script>
 </body>
 </html>

+ 4 - 0
src/main/resources/templates/supplier/list.html

@@ -74,6 +74,10 @@
         <span>页</span>&nbsp;
         <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
     </div>
+    <!--Ross 弹窗-->
+    <template v-if="showRossHtml">
+        <template th:replace="components/ross-advert"></template>
+    </template>
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>