Browse Source

Merge branch 'master' of git.oschina.net:yiguanjia/php

north 7 years ago
parent
commit
59e13d05c7

File diff suppressed because it is too large
+ 0 - 0
www/webapp/housekeeping/home/static/css/app.css


File diff suppressed because it is too large
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js.map


File diff suppressed because it is too large
+ 0 - 0
www/webapp/housekeeping/home/static/js/manifest.js.map


+ 8 - 0
www/webapp/housekeeping/src/components/reservation.vue

@@ -551,6 +551,14 @@
   }
 
   function time(t) {
+
+
+    let date = `2000-01-01 ${t}:00`;
+    date = date.substring(0, 19);
+    date = date.replace(/-/g, '/');
+    let timestamp = new Date(date).getTime();
+    timestamp = timestamp / 1000;
+    return timestamp;
     if (config.isiOS) {
       let date = `2000-01-01 ${t}:00`;
       date = date.substring(0, 19);

Some files were not shown because too many files changed in this diff