xuzhiheng 5 년 전
부모
커밋
f3b0d3adde

+ 4 - 2
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -265,8 +265,10 @@ $(function () {
         var downtime = r.data.order.order_countdown.split("h")[0]
         downtime = downtime * 60 * 60 * 1000
         var create_unix = new Date(order_create_time).getTime()
-        if(parseInt(liveActiveEndTime)*1000 - create_unix < 72*60*60*1000){
-            downtime = parseInt(liveActiveEndTime) * 1000 - create_unix;
+        if (new Date().getTime() >= parseInt(liveActiveStartTime)*1000 && new Date().getTime() < parseInt(liveActiveEndTime)*1000){
+            if(parseInt(liveActiveEndTime)*1000 - create_unix < 72*60*60*1000){
+                downtime = parseInt(liveActiveEndTime) * 1000 - create_unix;
+            }
         }
         var t = setInterval(() => {
           var nowtime = new Date()  //获取当前时间

+ 4 - 2
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -554,8 +554,10 @@ try{
           var downtime  = r.data.order.order_countdown.split("h")[0]
           downtime = downtime*60*60*1000
           var create_unix = new Date(order_create_time).getTime();
-          if(parseInt(liveActiveEndTime)*1000 - create_unix < 72*60*60*1000){
-              downtime = parseInt(liveActiveEndTime) * 1000 - create_unix;
+          if (new Date().getTime() >= parseInt(liveActiveStartTime)*1000 && new Date().getTime() < parseInt(liveActiveEndTime)*1000){
+              if(parseInt(liveActiveEndTime)*1000 - create_unix < 72*60*60*1000){
+                  downtime = parseInt(liveActiveEndTime) * 1000 - create_unix;
+              }
           }
           var t =setInterval(() => {
                 var nowtime = new Date()  //获取当前时间