Merge branch 'master' into release-20170915

components/default/Zhongqiu.vue

@@ -25,22 +25,33 @@ export default {
   name: 'zhongqiu',
   data () {
     return {
-      isClose: false,
-      cs: new Date().getTime().toString()
+      isClose: false
     }
   },
+  beforeMount () {
+    var self = this
+    setTimeout(getTotelNumber, 10000)
+    function getTotelNumber () {
+      self.isOpendZq()
+    }
+    getTotelNumber()
+  },
   mounted () {
     const endTime = window.localStorage.getItem('endTime')
-    if (endTime) {
-      if (new Date().getTime() - endTime >= 4 * 3600000) {
+    const overTime = new Date('2017/10/9 00:00:00').getTime()
+
+    if (overTime - (new Date().getTime()) > 0) {
+      if (endTime) {
+        if (new Date().getTime() - endTime >= 4 * 3600000) {
+          this.isClose = true
+          window.localStorage.setItem('endTime', new Date().getTime())
+        } else {
+          this.isClose = false
+        }
+      } else {
         this.isClose = true
         window.localStorage.setItem('endTime', new Date().getTime())
-      } else {
-        this.isClose = false
       }
-    } else {
-      this.isClose = true
-      window.localStorage.setItem('endTime', new Date().getTime())
     }
   },
   methods: {