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

www/webapp/housekeeping/src/components/reservation.vue

@@ -551,12 +551,21 @@
   }
 
   function time(t) {
-    let stringTime = '2000-01-11 ' + t + ':00';
-    // alert(stringTime);
-    let timestamp = Date.parse(new Date(stringTime));
-    alert(timestamp);
-    timestamp = timestamp / 1000;
-    return timestamp;
+    if (config.isiOS) {
+      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;
+    } else {
+      console.log(config);
+      let stringTime = '2017-07-11 ' + t + ':00';
+      let timestamp = Date.parse(new Date(stringTime));
+      alert(timestamp);
+      timestamp = timestamp / 1000;
+      return timestamp;
+    }
   }