云上美博会修改

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

@@ -305,7 +305,7 @@ a{color:#333;text-decoration:none}
 .cm-article-item{overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}
 .cm-article-item .cm-article-title{font-size:3.5vw;color:#4a4f58;-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s}
 .cm-article-item .cm-article-title.has-border{border-left:2px solid #fff}
-.cm-article-item .cm-article-desc{font-size:2.5vw;color:#93979f;line-height:2em;text-align:justify}
+.cm-article-item .cm-article-desc{font-size:2.5vw;color:#93979f;line-height:2em;text-align:justify;word-break: break-all;}
 .cm-article-item .cm-article-desc.h56{height:10.5vw}
 .cm-article-item .cm-article-cover.cover-168-168{width:27vw;height:27vw}
 .cm-article-item.h200{height:33vw}
@@ -335,7 +335,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(/img/activity/h5_entry_icon.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}
@@ -645,7 +645,7 @@ a{color:#333;text-decoration:none}
 .cm-article-item{-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
 .cm-article-item .cm-article-title{font-size:18px;color:#4a4f58;-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s}
 .cm-article-item .cm-article-title.has-border{border-left:2px solid #fff}
-.cm-article-item .cm-article-desc{font-size:14px;color:#93979f;line-height:2em;text-align:justify}
+.cm-article-item .cm-article-desc{font-size:14px;color:#93979f;line-height:2em;text-align:justify;word-break: break-all;}
 .cm-article-item .cm-article-desc.h56{height:56px}
 .cm-article-item .cm-article-cover.cover-168-168{width:168px;height:168px}
 .cm-article-item:hover .cm-article-title{color:#ff5c00}
@@ -678,7 +678,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(/img/activity/h5_entry_icon.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/static/js/activity/index.js → src/main/resources/static/js/activity/beautyTopic.js

@@ -159,12 +159,12 @@ var activeApp = (function () {
                 var oneDay = 60 * 60 * 24 * 1000;
                 // 直播开始时间：displayDate
                 // 直播结束时间：displayDate + oneDay
-                if (nowDate >= displayDate && nowDate <= displayDate + oneDay) {
-                    return 1; // 已开始
-                }
                 if (nowDate < displayDate) {
                     return 0; // 未开始
                 }
+                if (nowDate >= displayDate && nowDate <= displayDate + oneDay) {
+                    return 1; // 已开始
+                }
                 if (nowDate - oneDay > displayDate) {
                     return 2; // 已结束
                 }

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

@@ -10,7 +10,6 @@
     <link href="/css/activity/normalize.css" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="/css/activity/swiper.min.css"/>
     <link th:href="@{/css/activity/beautyTopic.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/activity/beautyTopic.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <input type="hidden" th:value="${coreServer}" id="coreServer">
@@ -36,8 +35,7 @@
                 >
                     <div :class="fetchTemplate([22,23,24,25],floorData.floorContent.templateType)?['cm-col-md-40', 'cm-col-xs-36']:''">
                         <div class="cm-title cm-text-ellipsis-1">{{floorData.title}}</div>
-                        <div class="cm-subtitle cm-text-ellipsis-1">{{floorData.detail}}<span>{{floorData.floorContent.templateType}}</span>
-                        </div>
+                        <div class="cm-subtitle cm-text-ellipsis-1">{{floorData.detail}}</div>
                     </div>
                     <div
                             class="cm-tabs cm-p-t-12 cm-absolute cm-bottom-right"
@@ -749,7 +747,7 @@
                     <div class="cm-tooltop-content cm-tooltop-1">
                         <div class="cm-item">展会咨询电话：13766896620</div>
                         <i></i>
-                        <div class="cm-item">业务咨询电话：13766896620</div>
+                        <div class="cm-item">客服咨询电话：13766896620</div>
                     </div>
                 </div>
             </div>
@@ -764,7 +762,7 @@
                         <div class="cm-left line"></div>
                         <div class="cm-item cm-left">
                             <img width="108" height="108" src="/img/activity/wechat_1.jpg" alt=""/>
-                            <span>业务咨询微信</span>
+                            <span>客服咨询微信</span>
                         </div>
                     </div>
                 </div>
@@ -777,7 +775,8 @@
             <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="/img/activity/pc_entry.png" alt="" v-if="!isMobile"/>
+                <img src="/img/activity/h5_entry.png" alt="" v-else/>
             </a>
         </div>
     </div>
@@ -797,17 +796,17 @@
 </div>
 <!-- 引入js文件 -->
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" src="/js/activity/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/base.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/utils.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/layout.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/mixin.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/index.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
+<script charset="utf-8" src="/js/activity/beautyTopic/swiper.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/base.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/utils.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/layout.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic/mixin.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/activity/beautyTopic.js(v=${version})}"></script>
 <script>
     var isFormal = window.location.href.indexOf('www.caimei365.com') !== -1;
     if (isFormal) {

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

@@ -0,0 +1,41 @@
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>优惠券说明</title>
+    <link href="https://www-b.caimei365.com/css/activity/normalize.css" rel="stylesheet" type="text/css">
+    <link href="https://www-b.caimei365.com/css/activity/beautyTopic.css?v=20210831-100013" rel="stylesheet"
+          type="text/css">
+</head>
+
+<body>
+<div>
+    <!-- 大图 -->
+    <div class="banner-container">
+        <div class="cm-container cm-relative">
+            <div class="banner">
+                <img src="" alt=""/>
+            </div>
+        </div>
+    </div>
+    <div class="cm-container">
+        <dl>
+            <dt>使用规则：</dt>
+            <dd>千元代金券礼包内含有11张价值1000元的平台通用券，分别是5张50元代金券（满500减50），3张100元代金券（满1000减100），3张150代金券（满1500减150）。</dd>
+            <dt>参与方式：</dt>
+            <dd>采美美博会期间，采美会员在采美平台购买任意商品满6000元即赠送价值1000元的代金券。</dd>
+            <dt>活动时间：</dt>
+            <dd>2021年9月4日至2021年9月8日</dd>
+            <dt>使用时间：</dt>
+            <dd>2021年9月4日至2021年12月8日</dd>
+            <dt>使用规则：</dt>
+            <dd>1.一个订单只能使用一张代金券。</dd>
+            <dd>2.代金券适用于采美任意平台商品。</dd>
+            <dt>注意事项：</dt>
+            <dd>1.赠送的代金券过期使用无效，请您在有效期内使用</dd>
+        </dl>
+    </div>
+</div>
+</body>
+</html>