Merge remote-tracking branch 'origin/hotfix-20190102' into dev

pages/mobile/center/user/btobarCheck.vue

@@ -312,20 +312,28 @@
   function getMonth() {
     let sdateTo = new Date()
     // console.log(sdateTo.getMonth() - 1)
-    return sdateTo.getMonth() - 1
+    if (sdateTo.getMonth() === 0) {
+      return 11
+    } else {
+      return sdateTo.getMonth() - 1
+    }
   }
   function getYear() {
     let num = 2000
     let sdateTo = new Date()
     let _year = sdateTo.getFullYear()
     for (let i = 0; i < 99; i++) {
-       num++
-       if (num === Number(_year)) {
-         num = i
-         break
-       }
+      num++
+      if (num === Number(_year)) {
+        num = i
+        break
+      }
+    }
+    if (sdateTo.getMonth() === 0) {
+      return num - 1
+    } else {
+      return num
     }
-    return num
   }
   export default {
     layout: 'mobileNoHeader',
@@ -424,8 +432,18 @@
       })
       this.getUnread()
       let sdateTo = new Date()
-      this.isShowApcheckList.thisMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
-      this.outTimeMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+      if (sdateTo.getMonth() === 0) {
+        let _time = new Date(sdateTo)
+        _time.setMonth(_time.getMonth())
+        _time.setDate(1)
+        // _time.setMonth(_time.getMonth())
+        _time.setDate(_time.getDate() - 1)
+        this.isShowApcheckList.thisMonth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+        this.outTimeMonth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+      } else {
+        this.isShowApcheckList.thisMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+        this.outTimeMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+      }
     },
     // mounted() {
     //   this.$nextTick(() => {

pages/mobile/center/vendor/btobapCheck.vue

@@ -315,7 +315,11 @@
   function getMonth() {
     let sdateTo = new Date()
     // console.log(sdateTo.getMonth() - 1)
-    return sdateTo.getMonth() - 1
+    if (sdateTo.getMonth() === 0) {
+      return 11
+    } else {
+      return sdateTo.getMonth() - 1
+    }
   }
   function getYear() {
     let num = 2000
@@ -328,7 +332,11 @@
          break
        }
     }
-    return num
+    if (sdateTo.getMonth() === 0) {
+      return num - 1
+    } else {
+      return num
+    }
   }
   export default {
     layout: 'mobileNoHeader',
@@ -428,8 +436,18 @@
       })
       this.getUnread()
       let sdateTo = new Date()
-      this.isShowApcheckList.thisMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
-      this.outTimeMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+      if (sdateTo.getMonth() === 0) {
+        let _time = new Date(sdateTo)
+        _time.setMonth(_time.getMonth())
+        _time.setDate(1)
+        // _time.setMonth(_time.getMonth())
+        _time.setDate(_time.getDate() - 1)
+        this.isShowApcheckList.thisMonth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+        this.outTimeMonth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+      } else {
+        this.isShowApcheckList.thisMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+        this.outTimeMonth = sdateTo.getFullYear() + '-' + sdateTo.getMonth()
+      }
     },
     // mounted() {
     //   this.$nextTick(() => {