Merge branch 'yz-outtime' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient into yz-outtime

combining.html

@@ -157,11 +157,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },
 

packkey/combining.html

@@ -157,11 +157,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },
 

packkey/reduce.html

@@ -185,11 +185,17 @@
       /* 倒计时 */
       const key_expiration_time = sessionStorage.getItem('key_expiration_time');
       if (key_expiration_time != 0) {
-        setInterval(() => {
+        const cls = setInterval(() => {
-          this.outTime = pageOutTime(key_expiration_time);
+          const time = pageOutTime(key_expiration_time);
+          if (time) {
+            this.outTime = time;
+          } else {
+            this.outTime = ['00', '00', '00'];
+            clearInterval(cls);
+          }
         }, 1000);
       } else {
-        this.outTime = [];
+        this.outTime = ['00', '00', '00'];
       }
     },
     filters: {

packkey/ysf-reduce.html

@@ -156,11 +156,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },
         filters: {

packkey/zfb-reduce.html

@@ -156,11 +156,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },
 

reduce.html

@@ -186,11 +186,17 @@
       /* 倒计时 */
       const key_expiration_time = sessionStorage.getItem('key_expiration_time');
       if (key_expiration_time != 0) {
-        setInterval(() => {
+        const cls = setInterval(() => {
-          this.outTime = pageOutTime(key_expiration_time);
+          const time = pageOutTime(key_expiration_time);
+          if (time) {
+            this.outTime = time;
+          } else {
+            this.outTime = ['00', '00', '00'];
+            clearInterval(cls);
+          }
         }, 1000);
       } else {
-        this.outTime = [];
+        this.outTime = ['00', '00', '00'];
       }
     },
     filters: {

ysf-reduce.html

@@ -152,11 +152,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },
         filters: {

zfb-reduce.html

@@ -151,11 +151,17 @@
             /* 倒计时 */
             const key_expiration_time = sessionStorage.getItem('key_expiration_time');
             if (key_expiration_time != 0) {
-                setInterval(() => {
+                const cls = setInterval(() => {
-                    this.outTime = pageOutTime(key_expiration_time);
+                    const time = pageOutTime(key_expiration_time);
+                    if (time) {
+                        this.outTime = time;
+                    } else {
+                        this.outTime = ['00', '00', '00'];
+                        clearInterval(cls);
+                    }
                 }, 1000);
             } else {
-                this.outTime = [];
+                this.outTime = ['00', '00', '00'];
             }
         },