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

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

@@ -498,7 +498,7 @@
           that.userAge = 1
         }
         let AM = time(that.serviceTimeAM)
-        // alert(AM);
+        alert(AM);
         return;
         let PM = time(that.serviceTimePM)
 
@@ -551,8 +551,8 @@
   }
 
   function time(t) {
-    let stringTime = '1970-01-01 ' + t + ':00';
-    alert(stringTime);
+    let stringTime = '2000-01-11 ' + t + ':00';
+    // alert(stringTime);
     let timestamp = Date.parse(new Date(stringTime));
     alert(timestamp);
     timestamp = timestamp / 1000;