IOS日期格式兼容，驿站代码更新
This commit is contained in:
parent
90a2e6bcb9
commit
dcfd0056ef
|
|
@ -373,7 +373,7 @@ export default {
|
|||
let str = this.formatDate(new Date())+" "+food.reserveEndTime;
|
||||
// let str = this.formatDate(new Date())+" 14:00:00";
|
||||
let currentTime = new Date().getTime();
|
||||
let inputTime = new Date(str).getTime();
|
||||
let inputTime = new Date(str.replace(/-/g,'/')).getTime();
|
||||
if (currentTime < inputTime) {
|
||||
console.log("可以预定");
|
||||
this.$set(this.dashesData, 'ifReserve', true)
|
||||
|
|
@ -385,8 +385,8 @@ export default {
|
|||
let startStr = this.formatDate(new Date())+" "+food.startTime;
|
||||
let endStr = this.formatDate(new Date())+" "+food.endTime;
|
||||
let currentTime = new Date().getTime();
|
||||
let startTime = new Date(startStr).getTime();
|
||||
let endTime = new Date(endStr).getTime();
|
||||
let startTime = new Date(startStr.replace(/-/g,'/')).getTime();
|
||||
let endTime = new Date(endStr.replace(/-/g,'/')).getTime();
|
||||
if (currentTime>startTime&¤tTime<endTime) {
|
||||
console.log("可以预定");
|
||||
this.$set(this.dashesData, 'ifReserve', true)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -252,8 +252,8 @@ export default {
|
|||
}
|
||||
this.daysList.push(obj)
|
||||
})
|
||||
this.newDate = this.daysList[0].showDate
|
||||
this.newDate2 = this.daysList[0].paramDate
|
||||
this.newDate = this.daysList[0].showDate;
|
||||
this.newDate2 = this.daysList[0].paramDate;
|
||||
this.hIndex=0;
|
||||
//获取预定餐菜谱
|
||||
this.getMenuListData()
|
||||
|
|
@ -312,7 +312,7 @@ export default {
|
|||
// let str = this.formatDate(new Date())+" 14:00:00";
|
||||
console.log(str)
|
||||
let currentTime = new Date().getTime();
|
||||
let inputTime = new Date(str).getTime();
|
||||
let inputTime = new Date(str.replace(/-/g,'/')).getTime();
|
||||
if (currentTime < inputTime) {
|
||||
console.log("可以预定");
|
||||
this.$set(food, 'ifReserve', true)
|
||||
|
|
@ -325,8 +325,8 @@ export default {
|
|||
let startStr = this.formatDate(new Date())+" "+food.startTime;
|
||||
let endStr = this.formatDate(new Date())+" "+food.endTime;
|
||||
let currentTime = new Date().getTime();
|
||||
let startTime = new Date(startStr).getTime();
|
||||
let endTime = new Date(endStr).getTime();
|
||||
let startTime = new Date(startStr.replace(/-/g,'/')).getTime();
|
||||
let endTime = new Date(endStr.replace(/-/g,'/')).getTime();
|
||||
console.log(currentTime)
|
||||
console.log(startTime)
|
||||
console.log(endTime)
|
||||
|
|
@ -498,7 +498,7 @@ export default {
|
|||
let str = this.formatDate(new Date())+" "+food.reserveEndTime;
|
||||
// let str = this.formatDate(new Date())+" 14:00:00";
|
||||
let currentTime = new Date().getTime();
|
||||
let inputTime = new Date(str).getTime();
|
||||
let inputTime = new Date(str.replace(/-/g,'/')).getTime();
|
||||
if (currentTime < inputTime) {
|
||||
this.$set(cartItem, 'ifReserve', true)
|
||||
} else {
|
||||
|
|
@ -509,8 +509,8 @@ export default {
|
|||
let startStr = this.formatDate(new Date())+" "+food.startTime;
|
||||
let endStr = this.formatDate(new Date())+" "+food.endTime;
|
||||
let currentTime = new Date().getTime();
|
||||
let startTime = new Date(startStr).getTime();
|
||||
let endTime = new Date(endStr).getTime();
|
||||
let startTime = new Date(startStr.replace(/-/g,'/')).getTime();
|
||||
let endTime = new Date(endStr.replace(/-/g,'/')).getTime();
|
||||
console.log(currentTime)
|
||||
console.log(startTime)
|
||||
console.log(endTime)
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ export default {
|
|||
}
|
||||
},
|
||||
onShow() {
|
||||
// uni.reLaunch({ url: '/pages/advanceOrder/index' })
|
||||
// setTimeout(()=>{
|
||||
if(Cookies.get('remember')){
|
||||
this.remember = [Cookies.get('remember')] || [];
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>智慧后勤</title><script src=https://res.wx.qq.com/open/js/jweixin-1.1.0.js></script><script>document.addEventListener('DOMContentLoaded', function() {
|
||||
document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
|
||||
})</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6b868f1e.js></script><script src=./static/js/index.6791e0a8.js></script></body></html>
|
||||
})</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6b868f1e.js></script><script src=./static/js/index.2743b5f9.js></script></body></html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 126 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 106 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue