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(that.resTime);
         return;
         let PM = time(that.serviceTimePM)
 
@@ -551,29 +551,12 @@
   }
 
   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);
-      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;
-    }
   }