Merge branch 'dev2.10.8' of http://192.168.3.207:10080/qmx/jy into dev2.10.8

src/jfw/modules/app/src/active_zb.json

@@ -1,7 +1,7 @@
 {
-	"live_Preheat_Start": 159284160,
-	"live_Preheat_End": 159412320,
-	"live_Active_Start": 159412320,
+	"live_Preheat_Start": 1592841600,
+	"live_Preheat_End": 1594123200,
+	"live_Active_Start": 1594123200,
 	"live_Active_End": 1594728000,
 	"live_Ing_Start": 159412320,
 	"live_Ing_End": 1594130400,

src/jfw/modules/app/src/web/staticres/jyapp/active/livePage/css/live_preheat.css

@@ -360,15 +360,18 @@
 }
 
 .live-preheat .weui-dialog .weui-input {
-  position: relative;
-  height: .96rem;
-  padding: 0 0.32rem;
-  font-size: 0.3rem;
-  line-height: .96rem;
-  color: #5F5E64;
-  box-sizing: border-box;
-  border-radius: 4px;
-  border: 1px solid rgba(0, 0, 0, 0.08);
+  	display: flex;
+    align-items: center;
+    position: relative;
+    height: .96rem;
+    padding: 0 modify(.16rem);
+    font-size: modify(.15rem);
+    line-height: normal;
+    color: #5F5E64;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.08);
+    box-sizing: border-box;
+    padding-left: .2rem;
 }
 
 .live-preheat .weui-dialog .weui-dialog__ft {

src/jfw/modules/app/src/web/templates/active/livePage/online.html

@@ -137,7 +137,7 @@
                 // 显示倒计时
                 showDom: function () {
                     // 活动结束时间 传一个结束时间字符串
-                    var t = showtime('2020/07/14/20:00')
+                    var t = showtime(1594728000000)
                     if (t.day == 0) {
                         $('.day').fadeOut()
                     }

src/web/staticres/live/css/live_preheat.css

@@ -360,15 +360,18 @@
 }
 
 .live-preheat .weui-dialog .weui-input {
-  position: relative;
-  height: .96rem;
-  padding: 0 0.32rem;
-  font-size: 0.3rem;
-  line-height: .96rem;
-  color: #5F5E64;
-  box-sizing: border-box;
-  border-radius: 4px;
-  border: 1px solid rgba(0, 0, 0, 0.08);
+  	display: flex;
+  	align-items: center;
+   	position: relative;
+   	height: .96rem;
+   	padding: 0 modify(.16rem);
+   	font-size: modify(.15rem);
+    line-height: normal;
+    color: #5F5E64;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.08);
+    box-sizing: border-box;
+    padding-left: .2rem;
 }
 
 .live-preheat .weui-dialog .weui-dialog__ft {