Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/library/borrow/bookreturn.vue

@@ -102,7 +102,9 @@ export default {
         })
         return
       }
-
+      this.getList()
+    },
+    getList () {
       this.getBorrowHistory({ customerInfo: this.customerInfo })
         .then(() => {
           this.active = 1
@@ -114,9 +116,6 @@ export default {
             type: 'error'
           })
         })
-      this.getList()
-    },
-    getList () {
       this.getUserReturn({ customerInfo: this.customerInfo, page: 1, pagesize: 1000 })
         .then(() => {
 

src/util/util.js

@@ -4,6 +4,9 @@ import api from './api'
 // import store from '../store'
 const toolClass = {
   dateFormat: (timestamp, fmt) => {
+    if (timestamp === '0001-01-01T00:00:00Z') {
+      return ''
+    }
     if (!fmt) {
       fmt = 'yyyy-MM-dd hh:mm'
     }