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

src/jfw/active/live.go

@@ -146,7 +146,7 @@ func (this *Active) LivePage() error {
 		return this.Render("/active/livePage/live_online_wx.html", &this.T)
 	} else if now.Unix() > config.ActiveConfig.Live_Active_Start { //直播活动进行中
 		//是否直播进行中
-		if config.ActiveConfig.Live_Ing_End > time.Now().Unix() && time.Now().Unix() > config.ActiveConfig.Live_Preheat_Start {
+		if config.ActiveConfig.Live_Ing_End > time.Now().Unix() && time.Now().Unix() > config.ActiveConfig.Live_Ing_Start {
 			this.T["LIVEING"] = true
 		}
 		return this.Render("/active/livePage/live_online_wx.html", &this.T)

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

@@ -3,7 +3,7 @@
 }
 
 .live-online .online-bg {
-  display: grid;
+  display: table;
   width: 100%;
   height: 10rem;
   background: url(../image/live_online_bg.png) no-repeat center center;

src/jfw/modules/app/src/web/staticres/jyapp/me/css/mine.css

@@ -115,6 +115,8 @@
   position: relative;
   border-radius: .24rem;
   color: #64696F;
+  width: 1.4rem;
+  text-align: center;
 }
 
 .mine .user .user_info .set_phone:before {

src/web/staticres/live/css/live_online.css

@@ -3,7 +3,7 @@
 }
 
 .live-online .online-bg {
-  display: grid;
+  display: table;
   width: 100%;
   height: 10rem;
   background: url(../image/live_online_bg.png) no-repeat center center;

src/web/templates/active/livePage/live_online_wx.html

@@ -158,12 +158,14 @@
       var PageInit = function(){
         $.ajax({
     			type: "post",
-    			url: "/active/livePage/status",
+    			url: "/active/livePage/status?v="+new Date().getTime(),
     			data: {},
     			dataType: "json",
     			success: function(data){
-    				if(data.userId!=""){
+    				if(data.userId!=undefined&&data.userId!=""){
               isSub=true;
+            }else{
+              isSub=false;
             }
             //购买人数
             if(data.liveactiveRTB){
@@ -188,7 +190,7 @@
               subHandle: function () {
                 //点击立即抢购
                 $('.understand').on('click', function () {
-                    if (isSub&&false){
+                    if (isSub){
                       window.location.href="/front/vipsubscribe/introducePage"
                     } else {
                       $androidActionSheet.fadeIn(200);
@@ -199,7 +201,7 @@
                 })
                 //点击了解VIP订阅
                 $(".j-button-confirm").on('click',function(){
-                  if (isSub&&false){
+                  if (isSub){
                     window.location.href="/front/vipsubscribe/introducePage"
                   } else {
                     $androidActionSheet.fadeIn(200);

src/web/templates/active/livePage/live_preheat_wx.html

@@ -167,7 +167,7 @@
       var PageInit = function(){
         $.ajax({
     			type: "post",
-    			url: "/active/livePage/status",
+    			url: "/active/livePage/status?v="+new Date().getTime(),
     			data: {},
     			dataType: "json",
     			success: function(data){