Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/activity/beautyTopic.css

@@ -334,7 +334,7 @@ a{color:#333;text-decoration:none}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
-.cm-float-container .cm-slide:nth-child(1){height:13.2vw;background:url(/img/activity/pc_note.png) no-repeat center;background-size:12vw}
+.cm-float-container .cm-slide:nth-child(1){height:13.2vw;background:url(https://static.caimei365.com/app/img/icon2/pc_note.png) no-repeat center;background-size:12vw}
 .cm-float-container .cm-slide:nth-child(2){background:#fff url(/img/activity/pc_01.png) no-repeat center}
 .cm-float-container .cm-slide:nth-child(2):hover{background:#ff5c00 url(/img/activity/pc_a1.png) no-repeat center}
 .cm-float-container .cm-slide:nth-child(3){background:#fff url(/img/activity/pc_02.png) no-repeat center}
@@ -677,7 +677,7 @@ a{color:#333;text-decoration:none}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
-.cm-float-container .cm-slide:nth-child(1){height:70px;background:url(/img/activity/pc_note.png) no-repeat center;background-size:64px}
+.cm-float-container .cm-slide:nth-child(1){height:70px;background:url(https://static.caimei365.com/app/img/icon2/pc_note.png) no-repeat center;background-size:64px}
 .cm-float-container .cm-slide:nth-child(2){background:#fff url(/img/activity/pc_01.png) no-repeat center}
 .cm-float-container .cm-slide:nth-child(2):hover{background:#ff5c00 url(/img/activity/pc_a1.png) no-repeat center}
 .cm-float-container .cm-slide:nth-child(3){background:#fff url(/img/activity/pc_02.png) no-repeat center}

src/main/resources/templates/activity/beautyTopic.html

@@ -777,7 +777,7 @@
             <span class="cm-close" @click="handleToggleActive(false)"></span>
             <a id="entry" target="_blank" href="/user/coupon-collection.html"
                onclick="_czc.push(['_trackEvent','云上美博会','点击','红包优惠券','1','entry'])">
-                <img src="/img/activity/pc_icon.png" alt=""/>
+                <img src="https://static.caimei365.com/app/img/icon2/pc_icon.png" alt=""/>
             </a>
         </div>
     </div>