浏览代码

bug: fix days diff

zjxpcyc 6 年前
父节点
当前提交
499a3754f7
共有 3 个文件被更改,包括 11 次插入4 次删除
  1. 7
    1
      package-lock.json
  2. 1
    0
      package.json
  3. 3
    3
      src/pages/system/library/borrow/bookreturn.vue

+ 7
- 1
package-lock.json 查看文件

@@ -3944,6 +3944,11 @@
3944 3944
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
3945 3945
       "dev": true
3946 3946
     },
3947
+    "dayjs": {
3948
+      "version": "1.7.8",
3949
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.7.8.tgz",
3950
+      "integrity": "sha512-Gp4Y5KWeSri0QOWGzHQz7VrKDkfEpS92dCLK7P8hYowRFbaym1vj3d6CoHio3apSS4KSi/qb5Edemv26IN5Hfg=="
3951
+    },
3947 3952
     "de-indent": {
3948 3953
       "version": "1.0.2",
3949 3954
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -12175,7 +12180,8 @@
12175 12180
     "prettier": {
12176 12181
       "version": "1.15.3",
12177 12182
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.15.3.tgz",
12178
-      "integrity": "sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg=="
12183
+      "integrity": "sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==",
12184
+      "dev": true
12179 12185
     },
12180 12186
     "pretty": {
12181 12187
       "version": "2.0.0",

+ 1
- 0
package.json 查看文件

@@ -18,6 +18,7 @@
18 18
     "@antv/g2": "^3.2.7",
19 19
     "axios": "^0.18.0",
20 20
     "clipboard": "^2.0.1",
21
+    "dayjs": "^1.7.8",
21 22
     "element-ui": "^2.4.5",
22 23
     "g2-vue": "^1.0.1",
23 24
     "js-base64": "^2.4.8",

+ 3
- 3
src/pages/system/library/borrow/bookreturn.vue 查看文件

@@ -86,6 +86,7 @@
86 86
 </template>
87 87
 
88 88
 <script>
89
+import dayjs from 'dayjs'
89 90
 import { createNamespacedHelpers, mapState } from 'vuex'
90 91
 
91 92
 const { mapState: mapLibSate, mapActions } = createNamespacedHelpers('library')
@@ -196,9 +197,8 @@ export default {
196 197
     },
197 198
 
198 199
     diffToday(dt) {
199
-      const days =
200
-        (new window.Date().getTime() - (new Date(dt)).getTime()) / (1000 * 60 * 60 * 24)
201
-      return days <= 0 ? 0 : days
200
+      const days = dayjs(new Date()).startOf('day').diff(dayjs(dt).startOf('day'), 'day')
201
+      return days < 0 ? 0 : days
202 202
     },
203 203
     cancel() {
204 204
       this.customerInfo = ''