Browse Source

云上美博会页面提交

喻文俊 3 years ago
parent
commit
1b78bb563d

+ 1 - 1
src/main/resources/static/css/activity/beautyTopic.css

@@ -358,7 +358,7 @@ a{color:#333;text-decoration:none}
 .banner-container .banner{width:100vw;position:absolute;height:100%;top:0;left:50%;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%)}
 .banner-container .cm-container{height:100%;padding: 0;}
 .banner-container img{display:block;height:100%}
-.has-player{position:absolute;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.3)}
+.has-player{position:absolute;top:0;left:0;width:100%;height:100%;}
 .has-player::before{content:'';display:block;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:40px;height:40px;background:url(/img/activity/pc-palyer.png) no-repeat center center;background-size: 6vw;}
 .cm-to-top{width:12vw;height:12vw;position:fixed;z-index:999;bottom:5%;right:15px;border-radius:6px;text-align:center;background:#fff;cursor:pointer;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}
 .cm-to-top .cm-icon-bar{display:block;margin:0 auto;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}

+ 4 - 4
src/main/resources/static/js/activity/index.js

@@ -126,13 +126,13 @@ var activeApp = (function () {
                 // 直播开始时间:displayDate
                 // 直播结束时间:displayDate + oneDay
                 if (nowDate >= displayDate && nowDate <= displayDate + oneDay) {
-                    return 1;
+                    return 1; // 已开始
                 }
-                if (nowDate < oneDay + displayDate && nowDate > displayDate - oneDay) {
-                    return 0;
+                if (nowDate < displayDate) {
+                    return 0; // 未开始
                 }
                 if (nowDate - oneDay > displayDate) {
-                    return 2;
+                    return 2; // 已结束
                 }
             },