3 роки тому · 4f69ae652f
--- a/src/main/resources/static/css/activity/beautyTopic.css
+++ b/src/main/resources/static/css/activity/beautyTopic.css
@@ -342,7 +342,7 @@ a{color:#333;text-decoration:none}
 
				 .cm-float-container .cm-slide:nth-child(3):hover{background:#ff5c00 url(/img/activity/pc_a2.png) no-repeat center}
			
 
				 .cm-float-container .cm-tooltop{position:absolute;padding:3.5vw;background:#ff5c00;top:0;right:16vw;border-radius:6px;display:none}
			
 
				 .cm-float-container .cm-tooltop::after{position:absolute;content:'';width:15px;height:15px;-webkit-transform:rotateZ(45deg);-ms-transform:rotate(45deg);transform:rotateZ(45deg);background:#ff5c00;right:-7px;top:15px}
			
 
				-.cm-float-container .cm-tooltop .cm-tooltop-content{font-size:2.2vw;color:#fff}
			
 
				+.cm-float-container .cm-tooltop .cm-tooltop-content{font-size:3.2vw;color:#fff}
			
 
				 .cm-float-container .cm-tooltop .cm-tooltop-content.cm-tooltop-1{width:51.6vw}
			
 
				 .cm-float-container .cm-tooltop .cm-tooltop-content.cm-tooltop-1 i{display:block;border-top:1px solid #f1f1f1}
			
 
				 .cm-float-container .cm-tooltop .cm-tooltop-content.cm-tooltop-1 .cm-item{padding:2.5vw 0}
			
@@ -686,7 +686,7 @@ a{color:#333;text-decoration:none}
 
				 .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}
			
 
				 .cm-float-container .cm-slide:nth-child(3):hover{background:#ff5c00 url(/img/activity/pc_a2.png) no-repeat center}
			
 
				-.cm-float-container .cm-tooltop{position:absolute;padding:15px;background:#ff5c00;top:0;right:80px;border-radius:6px;display:none}
			
 
				+.cm-float-container .cm-tooltop{position:absolute;padding:15px;background:#ff5c00;top:0;right:80px;border-radius:6px;display: none}
			
 
				 .cm-float-container .cm-tooltop::after{position:absolute;content:'';width:15px;height:15px;-webkit-transform:rotateZ(45deg);-ms-transform:rotate(45deg);transform:rotateZ(45deg);background:#ff5c00;right:-7px;top:15px}
			
 
				 .cm-float-container .cm-tooltop .cm-tooltop-content{font-size:14px;color:#fff}
			
 
				 .cm-float-container .cm-tooltop .cm-tooltop-content.cm-tooltop-1{width:190px}
			
--- a/src/main/resources/static/js/activity/beautyTopic.js
+++ b/src/main/resources/static/js/activity/beautyTopic.js
@@ -9,6 +9,8 @@ var activeApp = (function () {
 
				             isActive: true,
			
 
				             isRequest: true,
			
 
				             isLoading: true,
			
 
				+            showPhoneNum: false,
			
 
				+            showWechat: false,
			
 
				             // showScrollTop: false,
			
 
				             activityEntryVisiable: false,
			
 
				             contactVisiable: false,
			
@@ -142,8 +144,8 @@ var activeApp = (function () {
 
				             // 初始化红包入口状态
			
 
				             initActivityEntry: function initActivityEntry(begin, end) {
			
 
				                 const nowTime = new Date().getTime();
			
 
				-                const beginTime = new Date(begin).getTime();
			
 
				-                const endTime = new Date(end).getTime();
			
 
				+                const beginTime = new Date(begin.replace(/-/g, '/')).getTime();
			
 
				+                const endTime = new Date(end.replace(/-/g, '/')).getTime();
			
 
				                 return nowTime >= beginTime && nowTime <= endTime
			
 
				             }
			
 
				             ,
			
--- a/src/main/resources/templates/activity/beautyTopic.html
+++ b/src/main/resources/templates/activity/beautyTopic.html
@@ -11,7 +11,7 @@
 
				     <link rel="stylesheet" href="/css/activity/swiper.min.css"/>
			
 
				     <link th:href="@{/css/activity/beautyTopic.css(v=${version})}" rel="stylesheet" type="text/css">
			
 
				 </head>
			
 
				-<body>
			
 
				+<body ontouchstart>
			
 
				 <input type="hidden" th:value="${coreServer}" id="coreServer">
			
 
				 <div id="app">
			
 
				     <!-- 大图 -->