xiebaomin 1 年之前
父节点
当前提交
be93404c97
共有 28 个文件被更改,包括 513 次插入454 次删除
  1. 38 24
      src/main/resources/static/css/article/article.css
  2. 2 2
      src/main/resources/static/css/article/drawer-footer.css
  3. 12 3
      src/main/resources/static/css/base/base.h5.css
  4. 14 4
      src/main/resources/static/css/base/base.pc.css
  5. 1 0
      src/main/resources/static/css/index/index_new.h5.css
  6. 1 1
      src/main/resources/static/css/index/index_new.pc.css
  7. 3 3
      src/main/resources/static/css/supplier/list.css
  8. 22 24
      src/main/resources/static/js/article/common.js
  9. 3 15
      src/main/resources/static/js/article/detail.js
  10. 13 124
      src/main/resources/static/js/article/list.js
  11. 84 0
      src/main/resources/static/js/article/mixins/searchMixins.js
  12. 1 1
      src/main/resources/static/js/common/serviceapi/product.service.js
  13. 13 2
      src/main/resources/static/js/common/serviceapi/utils.service.js
  14. 3 3
      src/main/resources/static/js/index.js
  15. 42 24
      src/main/resources/static/js/mixins/cmSysMixins.js
  16. 9 7
      src/main/resources/static/js/mixins/cmsMixins.js
  17. 0 8
      src/main/resources/static/js/mixins/router.config.js
  18. 7 3
      src/main/resources/static/js/pay/caimei-hlbpay.js
  19. 1 0
      src/main/resources/static/js/product/list.js
  20. 3 1
      src/main/resources/templates/article/components/article-link.html
  21. 15 10
      src/main/resources/templates/article/detail.html
  22. 10 4
      src/main/resources/templates/article/list.html
  23. 33 16
      src/main/resources/templates/components/ross-advert.html
  24. 3 2
      src/main/resources/templates/encyclopedia/detail.html
  25. 177 168
      src/main/resources/templates/index.html
  26. 0 4
      src/main/resources/templates/product/instrument.html
  27. 1 1
      src/main/resources/templates/supplier/list.html
  28. 2 0
      src/main/resources/templates/supplier_login/index.html

+ 38 - 24
src/main/resources/static/css/article/article.css

@@ -178,12 +178,10 @@ dl,dd,dt{zoom:1}
 	.content .row:nth-last-child(1){border-bottom:0}
 	/*信息平台banner*/
 	.info-banner {width: fit-content;box-sizing: border-box;display: flex;justify-content: space-between;}
-	.info-banner .banner {width: 514px;margin-right: 10px;height: 384px;margin-bottom: 16px;overflow: hidden;}
+	.info-banner .banner {width: 524px;margin-right: 8px;height: 382px;margin-bottom: 16px;}
 	.info-banner .sider-banner {width: 360px;display: flex;flex-direction: column;}
-	.info-banner .sider-banner div {height: 186px;overflow: hidden;}
-	.info-banner .sider-banner div:nth-child(2) {margin-top: 10px;}
-	.info-banner img {-webkit-transition: all 0.2s;-moz-transition: all 0.2s;}
-	.info-banner img:hover {transform: scale(1.1);-moz-transform: scale(1.1);-ms-transform: scale(1.1);}
+	.info-banner .sider-banner div {height: 187px;}
+	.info-banner .sider-banner div:nth-child(2) {margin-top: 8px;}
 	.info-Notice {width: 284px;background: #fff;float: right;height: 384px;margin-bottom: 16px;}
 	.info-Notice .notice-title {display: flex;justify-content: space-between;box-sizing: border-box;height: 48px;padding: 14px 16px;}
 	.info-Notice .notice-title div:nth-child(1) {font-size: 16px;font-weight: bold;color: #333333;}
@@ -247,7 +245,7 @@ dl,dd,dt{zoom:1}
 	.row .new-img.xiao img:hover{border:solid 1px #FF5B00}
 	.row .new-blurb.xiao{padding-left:110px;min-height:70px !important}
 	.row .new-blurb .shuoming{font-size:14px;line-height:25px;max-height:78px;overflow :hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}
-	.tui .tui-img{display:block;position: relative; width:284px;height: 222px;margin-bottom:20px;overflow:hidden;background:#FFF url(/img/base/placeholder.png) no-repeat center center;background-size:80%}
+	.tui .tui-img{display:block;position: relative; width:284px;height: 343px;margin-bottom:20px;overflow:hidden;background:#FFF url(/img/base/placeholder.png) no-repeat center center;background-size:80%}
 	.tui .tui-img img{width:100%;height: 100%;object-fit: contain;}
 	.tui .tui-img::after{content: "";opacity: 0;width: 100%;height: 100%; position: absolute; left: 0;top: 0;box-sizing: border-box;border: 1px solid #FF5B00; transition: all 0.2s;}
 	.tui .tui-img:hover::after{opacity: 1;}
@@ -332,24 +330,34 @@ 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;overflow: hidden;}
+	/*供应商广告图*/
+	.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;transition: all 0.2s;}
-	.article-right-ross>a img:hover {transform: scale(1.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-main{width: 440px;height: 100%;box-sizing: border-box;padding: 24px 40px;float: right;position: relative;}
+	.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;opacity: 0;}
+	.ross-banner-fiexd.active{animation: rundbottom 0.5s backwards;bottom: 0;opacity: 1;}
+	.ross-banner-fiexd .ross-inner{width: 1200px;margin: 0 auto;}
+	.ross-mssg{height: 100%;float: left;}
+	.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 40px;}
+	.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: 28px;color: #FFFFFF;line-height: 50px;}
+	.ross-mssg .ross-mssg-text-b p{font-size: 16px;color: #FFFFFF;line-height: 40px;}
+	.ross-main{width: 400px;height: 100%;box-sizing: border-box;padding: 24px;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 .input{width: 280px;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: 280px;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;}
@@ -408,7 +416,7 @@ dl,dd,dt{zoom:1}
 	.info-banner .banner {width: 55vw;height: 40vw;box-sizing: border-box;}
 	.info-banner .sider-banner {width: 37.8vw;box-sizing: border-box;display: flex;flex-direction: column;}
 	.info-banner .sider-banner div {width: 100%;height: 19vw;}
-	.info-banner .sider-banner div:nth-child(2) {margin-top: 2vw;}
+	.info-banner .sider-banner div:nth-child(2) {margin-top: 1.6vw;}
 	.info-h5-notice {height: 10vw;box-sizing: border-box;margin: 1.6vw auto 3.2vw auto;width: 93.6vw;background: #fff;display: flex;justify-content: space-between;padding: 2.7vw 3.2vw;}
 	.info-h5-notice .h5-notice {font-weight: bold;font-size: 3.6vw;color: #333333;}
 	.info-h5-notice .h5-notice-title ul > li {list-style: disc;white-space: nowrap;text-overflow: ellipsis;width: 60vw;overflow: hidden;font-size: 3.2vw;}
@@ -575,10 +583,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;}
@@ -594,10 +611,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;}

+ 2 - 2
src/main/resources/static/css/article/drawer-footer.css

@@ -85,7 +85,7 @@
 
 .advertisement {
     /*position: sticky;*/
-    height: 35.6vw;
+    height: 55vw;
     width: 94.4vw;
     /*bottom: -36vw;*/
     margin: 0 auto 18vw auto;
@@ -104,7 +104,7 @@
 .advertisement .advertisement-link img {
     width: 100%;
     height: 100%;
-    object-fit: contain;
+    /*object-fit: contain;*/
 }
 /*@keyframes AdvsFrames {*/
 /*    0% {*/

+ 12 - 3
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;}

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

@@ -505,16 +505,26 @@ 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;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-banner-fiexd .ross-inner{width: 1200px;margin: 0 auto;}
+.ross-mssg{height: 100%;float: left;}
+.ross-mssg .ross-mssg-img{width: 260px;height: 260px;float: left;margin-right: 40px;}
+.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: 28px;color: #FFFFFF;line-height: 50px;}
+.ross-mssg .ross-mssg-text-b p{font-size: 16px;color: #FFFFFF;line-height: 40px;}
+.ross-main{width: 400px;height: 100%;box-sizing: border-box;padding: 24px;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 .input{width: 280px;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: 280px;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;}

+ 1 - 0
src/main/resources/static/css/index/index_new.h5.css

@@ -114,3 +114,4 @@
 .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;object-fit:cover;}

+ 1 - 1
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;}

+ 3 - 3
src/main/resources/static/css/supplier/list.css

@@ -9,7 +9,7 @@ li{list-style:none}
     .supplierItem:first-child{border:none}
     .supplierItem .right{float:right;width:576px;position:relative}
     .supplierItem .left{float:left;width:560px;box-sizing:border-box;padding-left:152px;position:relative}
-    .supplierItem .left .logo{position:absolute;left:0;top:0;width:136px;height:124px;line-height:124px;}
+    .supplierItem .left .logo{position:absolute;left:0;top:0;width:136px;height:124px;line-height:120px;border:1px solid #e1e1e1;}
     .supplierItem .left .logo img{width:100%;max-height:100%;background-color:#FFF;vertical-align:middle;}
     .supplierItem .left h5{line-height:32px;font-weight:bold;font-size:20px;}
     .supplierItem .left h5 span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:inline-block;vertical-align: middle;max-width:84%;}
@@ -17,8 +17,8 @@ li{list-style:none}
     .supplierItem .left p>span{white-space:normal;height:auto;display:inline-block;vertical-align:top;max-width:82%}
     .supplierItem .left .tag{display:inline-block;height:20px;line-height:20px;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:10px;padding:0 5px}
     .supplierItem .products{position:relative;height:124px}
-    .supplierItem .products li{float:left;width:100px;min-height:100px;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin-right:16px}
-    .supplierItem .products li img{width:100px;height:100px}
+    .supplierItem .products li{float:left;width:100px;min-height:100px;background:url(/img/base/placeholder.png) no-repeat center center;background-size:80%;margin-right:16px;border: 1px solid #e1e1e1;}
+    .supplierItem .products li img{width:98px;height:98px}
     .supplierItem .products li span{display:block;padding-top:8px;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:12px;color:#93979F}
     .supplierItem .products a:hover span{color:#FF5B00;}
     .supplierItem .right .four{position:absolute;right:0;top:38px;line-height:24px;font-size:16px;color:#FF5B00}

+ 22 - 24
src/main/resources/static/js/article/common.js

@@ -10,8 +10,7 @@ const handleFileUrl = (id) => {
     //     window.open(fileUrl, '_blank')
     // }
 }
-
-var articleSide = new Vue({
+const articleSide = new Vue({
     el: '#articleSide',
     data: {
         typeId: 0,
@@ -19,7 +18,7 @@ var articleSide = new Vue({
         labelTxt: '',
         labelList: [],
         recommend: {},
-        adList: [],
+        adList: []
     },
     methods: {
         // getLabels: function(){
@@ -36,15 +35,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 +55,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,32 +64,31 @@ 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);
             });
         }
 
     }
 });
-
-var drawerFooter = new Vue({
+const drawerFooter = new Vue({
     el: "#drawer-footer",
     data: {
         recommend: [],
@@ -98,8 +96,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 +106,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 +119,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;
                 }
             });
         },
     }
-})
+});

+ 3 - 15
src/main/resources/static/js/article/detail.js

@@ -17,9 +17,9 @@
     });
 }());
 //相关阅读
-var articleRelated = new Vue({
-    el: "#articleRelated",
-    mixins: [cmSysVitaMixins],
+const articleContent = new Vue({
+    el: "#articleContent",
+    mixins: [cmSysVitaMixins,searchMixins],
     data: {
         infoId: $("#articleId").val()?$("#articleId").val()*1:0,
         articleLabels: $("#articleLabels").val()?$("#articleLabels").val():"",
@@ -27,18 +27,6 @@ var articleRelated = new Vue({
         relatedLabels:''
     },
     methods: {
-        // getRelatedList: function () {
-        //     var _self = this;
-        //     if(this.infoId ===0){return;}
-        //     $.getJSON("/article/related",{
-        //         id: this.infoId,
-        //         labels: this.articleLabels
-        //     }).done(function (r) {
-        //         if (r.code === 0 && r.data) {
-        //             _self.related = r.data;
-        //         }
-        //     });
-        // },
 
     },
     created: function () {

+ 13 - 124
src/main/resources/static/js/article/list.js

@@ -1,12 +1,12 @@
-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({
-    el: '#articleList',
-    mixins: [cmSysVitaMixins],
+const articleList = new Vue({
+    el: '#ArticleContent',
+    mixins: [cmSysVitaMixins,searchMixins],
     filters: {
         keywordSlice: function (keyword) {
             return keyword.length > 6 ? keyword.slice(0, 6) + '…' : keyword;
@@ -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;
@@ -79,23 +78,22 @@ var articleList = new Vue({
         self.initAuthInputComplete();
         this.getNewList()
     },
-
     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 +353,7 @@ var articleList = new Vue({
             // }
         }),
         //获取更多数据
-        handleMore () {
+        handleMore() {
             if (this.params.num < this.pageTotal) { // 获取列表数据
                 if (this.requestFlag) {
                     this.params.num = this.params.num + 1;
@@ -391,128 +389,19 @@ 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({
-    el: "#infoNotice",
-    data: {
-        newsList: [],
-    },
-    mounted() {
-        this.getNewList()
-    },
-    methods: {
-        hanldDetails(id) {
-            window.open('/news/details.html?id='+id);
-        },
-        getNewList() {
-            PublicApi.GetHomeInit({ source: 1 },({ data }) => {
-                if (isPC) {
-                    this.newsList = data.annlist
-                } else {
-                    this.newsList = data.annlist.slice(0,1)
-                }
-            });
-        }
-    }
-})
-
-let searchTop = new Vue({
-    el: "#info-header",
-    data: {
-        show: false,
-        searchKeys: "",
-        right_drawer: false,
-        activeNames: '', // active names
-        keywords: '',
-        keywordsList: [],
-        selectUlKeys: null,
-    },
-    mounted() {
-    },
-    watch: {
-    //    关键词搜索
-        keywords(val) {
-            if (val) {
-                setTimeout(() => {
-                    this.getKeywordsList(val)
-                }, 500)
-            }
-        },
-    },
-    methods: {
-        async getKeywordsList(key) {
-            const {data} = await PublicApi.fetchQueryKeywordList({keyword: key})
-            this.keywordsList = data
-            this.selectUlKeys = document.getElementsByClassName('auto-select-list')[0]
-            if (data.length > 0) {
-                this.renderList()
-                this.selectUlKeys.style.display = 'block'
-            } else {
-                this.selectUlKeys.style.display = 'none'
-            }
-        },
-        renderList() {
-            this.selectUlKeys.innerHTML = ''
-            this.keywordsList.forEach((text) => {
-                const li = document.createElement('li');
-                li.innerHTML = text.keyword.replace(new RegExp(this.keywords, 'ig'), (match)=> '<span style="color: #FF5B00;">' + match + '</span>');
-                li.addEventListener('click', () => this.listItemClick(text));
-                this.selectUlKeys.appendChild(li);
-            })
-        },
-        listItemClick(text) {
-            this.keywords = text.keyword
-            this.selectUlKeys.innerHTML = ''
-            this.selectUlKeys.style.display = 'none'
-            this.itemClick(text.keyword)
-        },
-        itemClick: function (keyword) {
-            window.location.href = '/info/search-1.html?keyword='+keyword + '&linkageFlag=1';
-        },
-        // h5弹窗搜索
-        handlerH5Search() {
-            let tip = this.searchKeys === '' ? '请输入文章关键字!' : this.searchKeys.length < 2 ? '请至少输入两个关键字!' : true;
-            if(!tip) {
-                $.confirm({
-                    useBootstrap: false,
-                    boxWidth: (isPC ? '300px' : '70%'),
-                    title: '提示',
-                    content: tip,
-                    closeIcon: true,
-                    animation: 'opacity',
-                    closeAnimation: 'opacity',
-                    animateFromElement: false,
-                    buttons: {
-                        close: {
-                            text: '确定',
-                            btnClass: 'btn-confirm'
-                        }
-                    }
-                });
-            } else {
-                this.show = !this.show;
-                window.location.href = '/info/search-1.html?keyword=' + this.searchKeys
-            }
-        },
-        handleOpenLink() {
-            window.location.href = '/info/center-3-1.html'
-        }
-    }
-})
-
 function initFilterSort(option = {}) {
     var sortControl = $(option.el);
     var sortItem = sortControl.find('.search__sort_select li');

+ 84 - 0
src/main/resources/static/js/article/mixins/searchMixins.js

@@ -0,0 +1,84 @@
+// 信息中心头部搜索
+const searchMixins = new Vue({
+    el: "#info-header",
+    data: {
+        show: false,
+        searchKeys: "",
+        right_drawer: false,
+        activeNames: '', // active names
+        keywords: '',
+        keywordsList: [],
+        selectUlKeys: null,
+    },
+    mounted() {
+    },
+    watch: {
+        //    关键词搜索
+        keywords(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.getKeywordsList(val)
+                }, 500)
+            }
+        },
+    },
+    methods: {
+        async getKeywordsList(key) {
+            const {data} = await PublicApi.fetchQueryKeywordList({keyword: key})
+            this.keywordsList = data
+            this.selectUlKeys = document.getElementsByClassName('auto-select-list')[0]
+            if (data.length > 0) {
+                this.renderList()
+                this.selectUlKeys.style.display = 'block'
+            } else {
+                this.selectUlKeys.style.display = 'none'
+            }
+        },
+        renderList() {
+            this.selectUlKeys.innerHTML = ''
+            this.keywordsList.forEach((text) => {
+                const li = document.createElement('li');
+                li.innerHTML = text.keyword.replace(new RegExp(this.keywords, 'ig'), (match)=> '<span style="color: #FF5B00;">' + match + '</span>');
+                li.addEventListener('click', () => this.listItemClick(text));
+                this.selectUlKeys.appendChild(li);
+            })
+        },
+        listItemClick(text) {
+            this.keywords = text.keyword
+            this.selectUlKeys.innerHTML = ''
+            this.selectUlKeys.style.display = 'none'
+            this.itemClick(text.keyword)
+        },
+        itemClick: function (keyword) {
+            window.location.href = '/info/search-1.html?keyword='+keyword + '&linkageFlag=1';
+        },
+        // h5弹窗搜索
+        handlerH5Search() {
+            let tip = this.searchKeys === '' ? '请输入文章关键字!' : this.searchKeys.length < 2 ? '请至少输入两个关键字!' : true;
+            if(!tip) {
+                $.confirm({
+                    useBootstrap: false,
+                    boxWidth: (isPC ? '300px' : '70%'),
+                    title: '提示',
+                    content: tip,
+                    closeIcon: true,
+                    animation: 'opacity',
+                    closeAnimation: 'opacity',
+                    animateFromElement: false,
+                    buttons: {
+                        close: {
+                            text: '确定',
+                            btnClass: 'btn-confirm'
+                        }
+                    }
+                });
+            } else {
+                this.show = !this.show;
+                window.location.href = '/info/search-1.html?keyword=' + this.searchKeys
+            }
+        },
+        handleOpenLink() {
+            window.location.href = '/info/center-3-1.html'
+        }
+    }
+})

+ 1 - 1
src/main/resources/static/js/common/serviceapi/product.service.js

@@ -490,7 +490,7 @@ var ProductApi = {
          * @数据统计
          * @param:typeId 1:首页banner;2:直播模块;3:最新活动;4:热门文章;5:新品橱窗;6:活动列表
          */
-        getCommodityStatisticsType:function (params, callback) {//获取商品收藏列表
+        getCommodityStatisticsType:function (params, callback) {
             Http.AjaxService({
                 url:'/commodity/StatisticsType/statisticsNumber',
                 type:'get',

+ 13 - 2
src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -615,6 +615,17 @@ var PublicApi = {
                 callback(res);
             });
         },
+        getUserPopUpInfo: function (params, callback) {//查看供应商广告弹窗信息
+            Http.AjaxService({
+                url: '/user/information/getPopUpInfo',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            }).then(function (res) {
+                callback(res);
+            });
+        },
         userInformationInsertRoos: function (params, callback) {//插入填写咨询人基本信息
             Http.AjaxService({
                 url: '/user/information/insertRoos',
@@ -626,9 +637,9 @@ var PublicApi = {
                 callback(res);
             });
         },
-        userInformationVisitRoos: function (params, callback) {//查看访问者是否浏览过roos相关页面
+        getShopAdvert: function (params, callback) {//查看访问者是否浏览过roos相关页面
             Http.AjaxService({
-                url: '/user/information/visitRoos',
+                url: '/user/information/getShopAdvert',
                 type:'get',
                 data:params,
                 json:false,

+ 3 - 3
src/main/resources/static/js/index.js

@@ -116,16 +116,15 @@ var homeData = new Vue({
         GetHomeInit: function(){// 初始化
             var _self = this;
             PublicApi.GetHomeInit({ source: 1 },function(response){
-                if(response.code == 0){
+                if(response.code === 0){
                     _self.couponEntry = response.data.couponEntry
                     _self.quickoperaList = _self.footList(response.data.shortcutList)
-                    console.log(_self.quickoperaList)
                     if(isPC){
                         _self.newsList = response.data.annlist.slice(0,2)
                     }else{
                         _self.newsList = response.data.annlist.slice(0,1)
                     }
-                    if(GLOBAL_USER_ID == 0 &&_self.couponEntry == 1){
+                    if(GLOBAL_USER_ID === 0 && _self.couponEntry === 1){
                         var isActivityStatus =  localStorage.getItem('isActivityStatus');
                         //新加优惠券弹窗
                         if(isActivityStatus){
@@ -384,6 +383,7 @@ var homeData = new Vue({
             // 链接跳转
             if ($event.link) window.location.href = $event.link
         },
+
     },
     created: function() {
         if(GLOBAL_TOKEN){

+ 42 - 24
src/main/resources/static/js/mixins/cmSysMixins.js

@@ -15,26 +15,29 @@ var cmSysVitaMixins = function () {
                     shopId:0,//供应商Id
                     behaviorType:1 // 用户行为类型
                 },
-                handleProsId:0,
-                handleShopId:0,
-                handlearticleId:0,
-                handleProsKey:"",
-                handleShopKey:"",
-                productIds:roosConfig.productIds,//Ross 商品ID集合
-                shopIds:roosConfig.shopIds,// Ross 供应商Id
-                articleIds:roosConfig.articleIds,//Ross 相关文章ID 集合
-                keyWords:roosConfig.keyWords,// Ross 搜索商品关键词 集合
-                shopKeyWords:roosConfig.shopKeyWords,// Ross 搜索供应商名称 集合
-                showRossHtml:false,
+                handleProsId:'',
+                handleShopId:'',
+                handlearticleId:'',
+                handleProsKey:'',
+                handleShopKey:'',
                 consultParams:{
                     ip:'',
+                    shopId:'',
                     createTime:'',
                     consultMobile: '',
                     consultName: '',
                     isClick:1
                 },
+                popUpParams:{
+                    shopId:'',
+                    productId:'',
+                    infoId:'',
+                    keyword:''
+                },
+                advertisement:{},// 弹窗广告信息
+                showRossHtml:false,
                 isDisabled:true,
-                isRossShow:false
+                shopAdvert:[]
             }
         },
         methods: {
@@ -51,13 +54,13 @@ var cmSysVitaMixins = function () {
             handleCmSysNetInfo() {
                 //设置定时器
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
+                console.log('handleProsKey',this.handleProsKey)
                 if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
-                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)
-                ){
+                if( this.handleProsId || this.handleShopId || this.handlearticleId || this.handleProsKey || this.handleShopKey ){
+                    this.popUpParams.shopId = this.handleShopId
+                    this.popUpParams.productId = this.handleProsId
+                    this.popUpParams.infoId = this.handlearticleId
+                    this.popUpParams.keyword = this.handleProsKey ? this.handleProsKey : '' || this.handleShopKey ? this.handleShopKey : ''
                     this.cmSysParams.behaviorType = 2;
                     if (!GLOBAL_USER_ID>0) {
                         this.userInformationIsClick()
@@ -104,20 +107,34 @@ var cmSysVitaMixins = function () {
                     CAIMEI.dialog('请输入正确的手机号');
                     return
                 }
+
                 this.userInformationInsertRoos(this.consultParams);
             },
             handleClose(){
                 // 关闭Ross 广告弹窗
                 this.userInformationInsertRoos(this.consultParams);
             },
+            getUserPopUpInfo(params){
+                //查看供应商广告弹框信息
+                let _self = this;
+                PublicApi.getUserPopUpInfo(params, function (response) {
+                    if(response.code === 0){
+                        _self.advertisement = response.data
+                        _self.consultParams.shopId =  response.data.shopId
+                    }else{
+                        console.log('error',response.msg);
+                    }
+                })
+            },
             userInformationIsClick(){
-                //查询是否需要弹Ross广告
+                //查询是否需要弹广告
                 let _self = this;
-                PublicApi.userInformationIsClick({}, function (response) {
+                PublicApi.userInformationIsClick(_self.popUpParams, function (response) {
                     if(response.code === 0){
                         if(response.data){
                             setTimeout(()=>{
                                 _self.showRossHtml = true
+                                _self.getUserPopUpInfo(_self.popUpParams)
                             },5000)
                         }
                     }else{
@@ -136,12 +153,13 @@ var cmSysVitaMixins = function () {
                     }
                 })
             },
-            userInformationVisitRoos(params){
+            getShopAdvert(params){
                 //查看访问者是否浏览过roos相关页面
                 let _self = this;
-                PublicApi.userInformationVisitRoos(params, function (response) {
+                PublicApi.getShopAdvert(params, function (response) {
                     if(response.code === 0){
-                        _self.isRossShow = response.data
+                        _self.shopAdvert = response.data
+                        console.log('shopAdvert',_self.shopAdvert);
                     }else{
                         console.log('error',response.msg);
                     }
@@ -172,7 +190,7 @@ var cmSysVitaMixins = function () {
             // 页面加载完成后[监听]执行事件
             this.handleCmSysNetInfo()
             // 查看访问者是否浏览过roos相关页面
-            this.userInformationVisitRoos({ userId: this.cmSysParams.userId })
+            this.getShopAdvert({ userId: this.cmSysParams.userId })
         },
         destroyed() {
 

+ 9 - 7
src/main/resources/static/js/mixins/cmsMixins.js

@@ -3,14 +3,16 @@
 var cmsMixins = function () {
     return {
         mounted: function() {
-            window.handleBannerStatistics = this.handleBannerStatistics;
-            window.handleRightStatistics = this.handleRightStatistics;
-            window.handleHotStatistics = this.handleHotStatistics;
+            window.handleBannerStatistics = this.handleBannerStatistics
+            window.handleRightStatistics = this.handleRightStatistics
+            window.handleHotStatistics = this.handleHotStatistics
         },
         methods: {
             handleBannerStatistics:function($event){// 首页轮播
-                const $eventHref  = $event[0].attributes[2].value;
-                this.cmsSysStatistics(1)
+                const $eventHref  = $event[0].attributes[2].value
+                const $eventId  = $event[0].attributes[3].value
+                console.log(`<-------统计数据成功------>,${$eventId}`)
+                this.cmsSysStatistics(1,$eventId)
                 window.open($eventHref)
             },
             handleRightStatistics:function($event,type){// 右侧模块
@@ -27,8 +29,8 @@ var cmsMixins = function () {
                 this.cmsSysStatistics(6)
                 window.open($eventHref)
             },
-            cmsSysStatistics :function (cmsSysType) {
-                ProductApi.getCommodityStatisticsType({typeId:cmsSysType},function (response) {
+            cmsSysStatistics :function (cmsSysType,bannerId) {
+                ProductApi.getCommodityStatisticsType({typeId:cmsSysType,bannerId:bannerId},function (response) {
                     if(response.code === 0){
                         const map = {
                             1: '首页轮播',

+ 0 - 8
src/main/resources/static/js/mixins/router.config.js

@@ -1,11 +1,3 @@
-//Ross 统计配置
-const  roosConfig = {
-    productIds:[7247,7248],//Ross 商品ID集合
-    shopIds:[1378],// Ross 供应商Id
-    articleIds:[7184,7199,7531,7497,7471,7458,7440,7424,7398,7370,7356,7344,7300,7298,7232,6674,7633,7618,7614,7602,7599,7593,7591,7575,7298,7215],
-    keyWords:['Binary Premium','智能体疗管理系统','448k','肌肉重塑疗法','西班牙ROSS','ROSS','智能体疗','西班牙Ross','Ross','西班牙ross','ross'],
-    shopKeyWords:['深圳艾斯佰丽生物科技有限公司','艾斯佰丽']
-}
 //统计页面
 const includeList = [
     { title:'商城首页',url:'/',pageLabel:'商城首页',pageType:1 },

+ 7 - 3
src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -132,7 +132,7 @@ var payContainer = new Vue({
                     _self.onlinePay = data.onlinePay;
                     _self.isRequest = true;
                     // 支付方式配置
-                    _self.checkPayMode(data.onlinePayWays)
+                    _self.checkPayMode(data.onlinePayWays,data.weChatFlag)
                     _self.PayOrderOnLineSwitch();
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -140,10 +140,14 @@ var payContainer = new Vue({
             })
         },
         // 校验支付模式
-        checkPayMode(range){
+        checkPayMode(range,weChatFlag){
             // test range = '4'
             // 1微信 2支付宝 3个人网银 4企业网银
-            this.weChatFlag = range.indexOf('1') > -1
+            if(weChatFlag === '2'){
+                this.weChatFlag = false
+            }else{
+                this.weChatFlag = range.indexOf('1') > -1
+            }
             this.aliPayFlag = range.indexOf('2') > -1
             this.B2BpayFlag = range.indexOf('4') > -1
             this.QuickPayFlag = range.indexOf('5') > -1

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

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

+ 3 - 1
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"/>
 

+ 15 - 10
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" v-cloak>
     <div class="mainData">
         <div class="new-list article" th:if="${article}!=null">
             <div class="title" th:text="*{title}"></div>
@@ -91,19 +91,24 @@
                     <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>
-    <!--侧边栏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 && 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">
+                    <img :src="item.pcImage" alt="">
+                </a>
+            </el-carousel-item>
+        </el-carousel>
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
-
 </div>
 
 <template th:replace="article/components/article-drawer"></template>
@@ -117,7 +122,7 @@
 <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/article/common.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/mixins/searchMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/detail.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript">
     const closeContent = document.getElementsByClassName("related-content-close")[0]

+ 10 - 4
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 && shopAdvert.length > 0 " class="article-right-ross article-PC" :class="shopAdvert.length > 0 ? 'show' : 'none'" id="advertisement" v-cloak>
+        <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">
+                    <img :src="item.pcImage" alt="">
+                </a>
+            </el-carousel-item>
+        </el-carousel>
     </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
@@ -242,6 +247,7 @@
 <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/article/common.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/mixins/searchMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
 </body>
 </html>

+ 33 - 16
src/main/resources/templates/components/ross-advert.html

@@ -2,26 +2,43 @@
 <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 class="ross-inner">
+      <div class="ross-mssg">
+        <div class="ross-mssg-img">
+          <img :src="advertisement.image" alt="">
         </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 class="ross-mssg-text">
+          <div class="ross-mssg-text-t">
+            <p>{{ advertisement.guidingOne }}</p>
+            <p>{{ advertisement.guidingTwo }}</p>
+          </div>
+          <div class="ross-mssg-text-b">
+            <i class="el-icon-caret-bottom"></i>
+            <p>请留下您的姓名和手机号,采美会安排咨询顾问联系您!</p>
+          </div>
         </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 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 class="ross-close" @click="handleClose"></div>
     </div>
   </div>
 </div>

+ 3 - 2
src/main/resources/templates/encyclopedia/detail.html

@@ -60,8 +60,9 @@
                     </div>
                 </div>
                 <div class="bk-company">
-                    <div class="bk-cover"><img src="https://picsum.photos/280/220?random=4"></div>
-                    <div class="bk-title">上海品辉医疗科技有限公司</div>
+<!--                    <div class="bk-cover"><img src="https://picsum.photos/280/220?random=4"></div>-->
+                    <div class="bk-cover"><img th:src="*{shopLogo} ? *{shopLogo} : '/img/base/placeholder.png'"></div>
+                    <div class="bk-title" th:text="*{shopName}">上海品辉医疗科技有限公司</div>
                 </div>
                 <div class="bk-directory">
                     <div class="bk-title">导航<span>></span></div>

+ 177 - 168
src/main/resources/templates/index.html

@@ -18,40 +18,79 @@
     <link rel="stylesheet" href="/lib/vant/index.css" />
     <template th:replace="components/analysis"></template>
 </head>
-
 <body>
-    <!-- 引用头部 -->
-    <template th:replace="components/header"></template>
-    <!-- 首页 -->
-    <div id="container" v-cloak>
-        <!--首页图片轮播-->
-        <div id="swiper-container" class="swiper-container">
-            <ul class="swiper-wrapper swiper-wrapper-banner">
-                <li class="swiper-slide mfc" th:each="img: ${bannerList}">
-                    <a href="javascript:void(0)" th:attr="data-href=${img.link}" onclick="handleBannerStatistics($(this))"><img th:src="${img.image}" th:alt="${img.title}"></a>
-                </li>
-            </ul>
-            <div class="swiper-pagination swiper-pagination-banner mfc"><span v-if="isPC" th:each="img: ${bannerList}"></span></div>
-            <a class="swiper-button-prev" href="javascript:void(0)"></a>
-            <a class="swiper-button-next" href="javascript:void(0)"></a>
-        </div>
-        <div class="mNavBox h5Only clear">
-            <!--导航菜单-->
-            <a th:each="menu: ${topMenuList}" class="nav" th:href="${menu.link}">
-                <img class="nav-icon" th:src="${menu.icon}" th:alt="${menu.name}">
-                <p th:text="${menu.name}"></p>
-            </a>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 首页 -->
+<div id="container" v-cloak>
+    <!--首页图片轮播-->
+    <div id="swiper-container" class="swiper-container">
+        <ul class="swiper-wrapper swiper-wrapper-banner">
+            <li class="swiper-slide mfc" th:each="img: ${bannerList}">
+                <a href="javascript:void(0)"
+                   th:attr="data-href=${img.link},data-id=${img.id}"
+                   onclick="handleBannerStatistics($(this))">
+                    <img th:src="${img.image}" th:alt="${img.title}">
+                </a>
+            </li>
+        </ul>
+        <div class="swiper-pagination swiper-pagination-banner mfc"><span v-if="isPC" th:each="img: ${bannerList}"></span></div>
+        <a class="swiper-button-prev" href="javascript:void(0)"></a>
+        <a class="swiper-button-next" href="javascript:void(0)"></a>
+    </div>
+    <div class="mNavBox h5Only clear">
+        <!--导航菜单-->
+        <a th:each="menu: ${topMenuList}" class="nav" th:href="${menu.link}">
+            <img class="nav-icon" th:src="${menu.icon}" th:alt="${menu.name}">
+            <p th:text="${menu.name}"></p>
+        </a>
+    </div>
+    <div class="quickOperation" v-if="quickoperaList.length > 0 && !isPC" v-cloak>
+        <van-swipe class="my-swipe" :autoplay="false">
+            <van-swipe-item v-for="(item, index) in quickoperaList" :key="item">
+                <div class="carousel-list">
+                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
+                        <div class="list-content">
+                            <div class="list-icon">
+                                <van-image style="width: 100%; height: 100%;" :src="i.icon" />
+                            </div>
+                            <div class="list-title">
+                                <div class="title-1">
+                                    <div class="title-1-item">{{i.name}}</div>
+                                    <div class="title-2-item">GO></div>
+                                </div>
+                                <div class="title-2">{{i.remark || ''}}</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </van-swipe-item>
+        </van-swipe>
+    </div>
+    <div id="new-container" class="section_container" v-if="newsList.length>0">
+        <div class="inner">
+            <div class="new-label">公告:</div>
+            <div class="new-list">
+                <a href="javascript:void(0)" class="new-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
+                    <span class="new-icon"></span>
+                    <p v-text="list.title"></p>
+                </a>
+            </div>
+            <a href="/news.html" class="new-more"> 更多>> </a>
         </div>
-        <div class="quickOperation" v-if="quickoperaList.length > 0 && !isPC" v-cloak>
-            <van-swipe class="my-swipe" :autoplay="false">
-                <van-swipe-item v-for="(item, index) in quickoperaList" :key="item">
-                    <div class="carousel-list">
-                        <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
-                            <div class="list-content">
-                                <div class="list-icon">
-                                    <van-image style="width: 100%; height: 100%;" :src="i.icon" />
+    </div>
+    <!--  快捷运营  -->
+    <div class="quickOperation" v-if="quickoperaList.length > 0 && isPC" v-cloak>
+        <el-carousel :autoplay="false" indicator-position="outside">
+            <el-carousel-item v-for="(item, index) in quickoperaList" :key="item">
+                <div class="carousel-list">
+                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
+                        <div class="card">
+                            <div class="card-content">
+                                <div class="card-icon">
+                                    <el-image style="width: 100%; height: 100%;" :src="i.icon"></el-image>
                                 </div>
-                                <div class="list-title">
+                                <div class="card-title">
                                     <div class="title-1">
                                         <div class="title-1-item">{{i.name}}</div>
                                         <div class="title-2-item">GO></div>
@@ -61,134 +100,103 @@
                             </div>
                         </div>
                     </div>
-                </van-swipe-item>
-            </van-swipe>
-        </div>
-        <div id="new-container" class="section_container" v-if="newsList.length>0">
-            <div class="inner">
-                <div class="new-label">公告:</div>
-                <div class="new-list">
-                    <a href="javascript:void(0)" class="new-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
-                        <span class="new-icon"></span>
-                        <p v-text="list.title"></p>
-                    </a>
                 </div>
-                <a href="/news.html" class="new-more"> 更多>> </a>
-            </div>
-        </div>
-        <!--  快捷运营  -->
-        <div class="quickOperation" v-if="quickoperaList.length > 0 && isPC" v-cloak>
-            <el-carousel :autoplay="false" indicator-position="outside">
-                <el-carousel-item v-for="(item, index) in quickoperaList" :key="item">
-                    <div class="carousel-list">
-                        <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
-                            <div class="card">
-                                <div class="card-content">
-                                    <div class="card-icon">
-                                        <el-image style="width: 100%; height: 100%;" :src="i.icon"></el-image>
-                                    </div>
-                                    <div class="card-title">
-                                        <div class="title-1">
-                                            <div class="title-1-item">{{i.name}}</div>
-                                            <div class="title-2-item">GO></div>
-                                        </div>
-                                        <div class="title-2">{{i.remark || ''}}</div>
-                                    </div>
+            </el-carousel-item>
+        </el-carousel>
+    </div>
+    <!--首页楼层主体数据-->
+    <div class="section_container">
+        <div class="inner">
+            <div id="sidebar" class="section_right">
+                <div class="box" >
+                    <div class="section_right_item ross" v-if="shopAdvert.length > 0">
+                        <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">
+                                    <img :src="item.pcImage" alt="">
+                                </a>
+                            </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">
+                            <p>精彩直播</p>
+                            <a href="https://wx.vzan.com/plug-ins/?v=637429463853329710#/FixupIndex/399803126?shareuid=0" target="_blank"  rel="nofollow" onclick="_czc.push(['_trackEvent','商城首页','精彩直播','点击','','Um_Event_HomeLiveTemplateClick'])">
+                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                            </a>
+                        </div>
+                        <div class="right_item_main" th:each="live,stat : ${sideJson.get('liveList')}" th:object="${live}">
+                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_banner">
+                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{liveTitle}">
+                                <div class="name" th:text="*{liveTitle}"></div>
+                                <div class="statu">
+                                    <template th:if="*{liveStatus}==1"><i class="mIcon icon-wart"></i><p>未开始</p></template>
+                                    <template th:if="*{liveStatus}==2"><i class="mIcon icon-live"></i><p>直播中</p></template>
+                                    <template th:if="*{liveStatus}==3"><i class="mIcon icon-end"></i><p>看回放</p></template>
                                 </div>
-                            </div>
+                            </a>
+                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_text">
+                                <p class="item_text_name" th:text="*{liveTitle}"></p>
+                            </a>
                         </div>
                     </div>
-                </el-carousel-item>
-            </el-carousel>
-        </div>
-        <!--首页楼层主体数据-->
-        <div class="section_container">
-            <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 id="fixed-wrap" class="section_right_item" th:if="${sideJson.get('cmImageList')}!=null and ${sideJson.get('cmImageList').size}>0">
+                        <div class="right_item_title">
+                            <p>最新活动</p>
+                            <a href="https://www.caimei365.com/promotions.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','最新活动','点击','','Um_Event_HomeActivityTemplateClick'])">
+                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                            </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>
-                                <a href="https://wx.vzan.com/plug-ins/?v=637429463853329710#/FixupIndex/399803126?shareuid=0" target="_blank" rel="nofollow" onclick="_czc.push(['_trackEvent','商城首页','精彩直播','点击','','Um_Event_HomeLiveTemplateClick'])">
-                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                                </a>
-                            </div>
-                            <div class="right_item_main" th:each="live,stat : ${sideJson.get('liveList')}" th:object="${live}">
-                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_banner">
-                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{liveTitle}">
-                                    <div class="name" th:text="*{liveTitle}"></div>
-                                    <div class="statu">
-                                        <template th:if="*{liveStatus}==1"><i class="mIcon icon-wart"></i><p>未开始</p></template>
-                                        <template th:if="*{liveStatus}==2"><i class="mIcon icon-live"></i><p>直播中</p></template>
-                                        <template th:if="*{liveStatus}==3"><i class="mIcon icon-end"></i><p>看回放</p></template>
-                                    </div>
-                                </a>
-                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_text">
-                                    <p class="item_text_name" th:text="*{liveTitle}"></p>
-                                </a>
-                            </div>
+                        <div class="right_item_main" th:each="image,stat : ${sideJson.get('cmImageList')}" th:object="${image}">
+                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
+                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
+                                <div class="name" th:text="*{title}"></div>
+                            </a>
+                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)"  th:title="*{title}" class="item_text">
+                                <p class="item_text_name" th:text="*{title}"></p>
+                            </a>
                         </div>
-                        <div id="fixed-wrap" class="section_right_item" th:if="${sideJson.get('cmImageList')}!=null and ${sideJson.get('cmImageList').size}>0">
-                            <div class="right_item_title">
-                                <p>最新活动</p>
-                                <a href="https://www.caimei365.com/promotions.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','最新活动','点击','','Um_Event_HomeActivityTemplateClick'])">
-                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                                </a>
-                            </div>
-                            <div class="right_item_main" th:each="image,stat : ${sideJson.get('cmImageList')}" th:object="${image}">
-                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
-                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
-                                    <div class="name" th:text="*{title}"></div>
-                                </a>
-                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_text">
-                                    <p class="item_text_name" th:text="*{title}"></p>
-                                </a>
-                            </div>
+                    </div>
+                    <div class="section_right_item" th:if="${sideJson.get('infoList')}!=null and ${sideJson.get('infoList').size}>0">
+                        <div class="right_item_title">
+                            <p>热门文章</p>
+                            <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门文章','点击','','Um_Event_HomeArticleTemplateClick'])">
+                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                            </a>
                         </div>
-                        <div class="section_right_item" th:if="${sideJson.get('infoList')}!=null and ${sideJson.get('infoList').size}>0">
-                            <div class="right_item_title">
-                                <p>热门文章</p>
-                                <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门文章','点击','','Um_Event_HomeArticleTemplateClick'])">
-                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                                </a>
-                            </div>
-                            <div class="right_item_main" th:each="info,stat : ${sideJson.get('infoList')}" th:object="${info}">
-                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
-                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
-                                    <div class="name" th:text="*{title}"></div>
-                                </a>
-                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)" th:title="*{title}" class="item_text">
-                                    <p class="item_text_name info" th:text="*{title}"></p>
-                                    <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p>
-                                </a>
-                            </div>
+                        <div class="right_item_main" th:each="info,stat : ${sideJson.get('infoList')}" th:object="${info}">
+                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)"  th:title="*{title}" class="item_banner">
+                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
+                                <div class="name" th:text="*{title}"></div>
+                            </a>
+                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)"  th:title="*{title}" class="item_text">
+                                <p class="item_text_name info" th:text="*{title}"></p>
+                                <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p>
+                            </a>
                         </div>
-                        <div class="section_right_item" th:if="${sideJson.get('baikeList')}!=null and ${sideJson.get('baikeList').size}>0">
-                            <div class="right_item_title">
-                                <p>热门百科</p>
-                                <a href="/encyclopedia/product.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
-                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                                </a>
-                            </div>
-                            <div class="right_item_main" th:each="info,stat : ${sideJson.get('baikeList')}" th:object="${info}">
-                                <a th:if="${stat.index}==0" th:href="*{link}" th:title="*{name}" class="item_banner">
-                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
-                                    <div class="name" th:text="*{name}"></div>
-                                </a>
-                                <a th:if="${stat.index}>0" th:href="*{link}" th:title="*{name}" class="item_text">
-                                    <p class="item_text_name info" th:text="*{name}"></p>
-                                    <!-- <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p> -->
-                                </a>
-                            </div>
+                    </div>
+                    <div class="section_right_item" th:if="${sideJson.get('baikeList')}!=null and ${sideJson.get('baikeList').size}>0">
+                        <div class="right_item_title">
+                            <p>热门百科</p>
+                            <a href="/encyclopedia/product.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
+                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                            </a>
+                        </div>
+                        <div class="right_item_main" th:each="info,stat : ${sideJson.get('baikeList')}" th:object="${info}">
+                            <a th:if="${stat.index}==0"  th:href="*{link}"  th:title="*{name}" class="item_banner">
+                                <img src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
+                                <div class="name" th:text="*{name}"></div>
+                            </a>
+                            <a th:if="${stat.index}>0" th:href="*{link}"  th:title="*{name}" class="item_text">
+                                <p class="item_text_name info" th:text="*{name}"></p>
+                                <!-- <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p> -->
+                            </a>
                         </div>
                     </div>
                 </div>
-                <div class="section_left ">
-                    <template v-if="userId > 0">
+            </div>
+            <div class="section_left ">
+                <template v-if="userId > 0">
                     <!--固定楼层-->
                     <div class="section_page section_page_user hot" v-for="(floor,index) in hotListPageFloor">
                         <div class="section_page_title" >
@@ -227,30 +235,30 @@
                                                                         <span v-html="pros.product && pros.product.svipPriceTag"></span>
                                                                     </div>
                                                                 </template>
-                    </template>
-                </div>
-                </template>
-                <template v-else>
+                                                            </template>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <p class="listTag" v-if="pros.product.actStatus == 1 && pros.product.promotions">
                                                             <span v-text="pros.product.promotions && pros.product.promotions.name"></span>
                                                         </p>
                                                     </template>
-            </div>
-            <div class="main_price_login">
-                <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
-                <template v-if="pros.product && pros.product.priceFlag == 1">
+                                                </div>
+                                                <div class="main_price_login">
+                                                    <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                    <template v-if="pros.product && pros.product.priceFlag == 1">
                                                         <em class="price_grade_club"><span>¥</span>价格未公开</em>
                                                     </template>
-                <!--机构价仅会员可见 && 用户是普通机构-->
-                <template v-else-if="pros.product && pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                                                    <!--机构价仅会员可见 && 用户是普通机构-->
+                                                    <template v-else-if="pros.product && pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
                                                         <em class="price_grade_club"><span>¥</span>会员可见</em>
                                                     </template>
-                <!--机构价仅医美机构可见-->
-                <template v-else-if="pros.product && pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                    <!--机构价仅医美机构可见-->
+                                                    <template v-else-if="pros.product && pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                         <em class="price_grade_club red"><span>¥</span>仅医美机构可见</em>
                                                     </template>
-                <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
-                <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
+                                                    <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
+                                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
                                                         (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) ||
                                                         (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId==GLOBAL_SHOP_ID) ||
                                                         GLOBAL_VIP_FLAG === 1">
@@ -260,17 +268,17 @@
                                                             <span class="price_num" v-else v-text="filtersFormat(pros.product.price)"></span>
                                                         </div>
                                                     </template>
-                <template v-else>
+                                                    <template v-else>
                                                         <!--供应商除自己的商品外,也显示价格等级-->
                                                         <em class="price_grade_shop">
                                                             <span class="bold">¥</span>
                                                             <i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
                                                         </em>
                                                     </template>
-            </div>
-            </template>
-            <!-- 二手商品 -->
-            <template v-else>
+                                                </div>
+                                            </template>
+                                            <!-- 二手商品 -->
+                                            <template v-else>
                                                 <div class="main_price_login">
                                                     <div class="price_text_tag"></div>
                                                     <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">¥价格祥聊</div>
@@ -317,7 +325,8 @@
                                     </template>
         <template v-if="floor.floorContent.templateType == 2 ||
                                                     floor.floorContent.templateType == 3 ||
-                                                    floor.floorContent.templateType == 4">
+                                                    floor.floorContent.templateType == 4"
+                                    >
                                         <a :href="floor.floorContent.adsLink2 ? floor.floorContent.adsLink2 : 'javascript:;'"
                                            :target="floor.floorContent.adsLink2 ? '_blank' : '_self'"
                                            class="page_main_item ad_02"

+ 0 - 4
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">

+ 1 - 1
src/main/resources/templates/supplier/list.html

@@ -29,7 +29,7 @@
         <li class="supplierItem clear" v-for="shop in listData"  @click="hanldHrefLink(shop)">
             <div class="left">
                 <a href="javascript:void(0);" class="logo">
-                    <img :src="shop.logo" onerror="javascript:this.src='/img/base/placeholder.png';">
+                    <img src="/img/base/placeholder.png" :data-original="shop.logo">
                 </a>
                 <h5><a href="javascript:void(0);" :title="shop.name">
                     <span v-html="shop.name"></span>

+ 2 - 0
src/main/resources/templates/supplier_login/index.html

@@ -20,6 +20,8 @@
     <!--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"/>
+    <!--vant 样式    -->
+    <link rel="stylesheet" href="/lib/element-ui/index.css"/>
 </head>
 
 <body>