diff --git a/pages/park/book.vue b/pages/park/book.vue index 8c9dce4..52b6c3f 100644 --- a/pages/park/book.vue +++ b/pages/park/book.vue @@ -9,7 +9,7 @@ - {{(form.time?$u.timeFormat(_formTime, 'yyyy年mm月dd日 hh:MM'):'请选择入场时间>')}} + {{(form.time?timeFormat(_formTime, 'yyyy年MM月DD日 HH:mm'):'请选择入场时间>')}} @@ -199,6 +199,9 @@ clearTimeout(this.timer) }, methods: { + timeFormat(val, format) { + return this.$moment(val).format(format) + }, goHome() { uni.switchTab({ url: "/pages/index/index" @@ -251,15 +254,15 @@ this.selectInfo = this.$moment(this.listOrder[index].date).format("MM月DD日") + " " + this.listOrder[ index].time this.form.time = this.$moment(this.listOrder[index].date + " " + this.listOrder[ - index].time.split("-")[0]).format("YYYY-MM-DD hh:mm:ss"); + index].time.split("-")[0]).format("YYYY-MM-DD HH:mm:ss"); this.form.visit_order_id = this.orderid = this.listOrder[index].id; } else { this.listActivtyOrder[index].checked = true - this.selectInfo = this.$moment(this.listActivtyOrder[index].activity.start_time).format("MM月DD日 hh:mm") + this.selectInfo = this.$moment(this.listActivtyOrder[index].activity.start_time).format("MM月DD日 HH:mm") this.form.time = this.$moment(this.listActivtyOrder[index].activity.start_time).format( - "YYYY-MM-DD hh:mm:ss"); + "YYYY-MM-DD HH:mm:ss"); this.form.activity_order_id = this.orderid = this.listActivtyOrder[index].id; } this.orderType = type; diff --git a/pages/park/index.vue b/pages/park/index.vue index 81500bc..3ec5cf5 100644 --- a/pages/park/index.vue +++ b/pages/park/index.vue @@ -208,15 +208,15 @@ .listOrder[ index].time this.selectInfo.time = this.$moment(this.listOrder[index].date + " " + this.listOrder[ - index].time.split("-")[0]).format("YYYY-MM-DD hh:mm:ss"); + index].time.split("-")[0]).format("YYYY-MM-DD HH:mm:ss"); this.selectInfo.orderid = this.orderid = this.listOrder[index].id; } else { this.listActivtyOrder[index].checked = true this.selectInfo.info = this.$moment(this.listActivtyOrder[index].activity.start_time).format( - "MM月DD日 hh:mm") + "MM月DD日 HH:mm") this.selectInfo.time = this.$moment(this.listActivtyOrder[index].activity.start_time).format( - "YYYY-MM-DD hh:mm:ss"); + "YYYY-MM-DD HH:mm:ss"); this.selectInfo.orderid = this.orderid = this.listActivtyOrder[index].id; } this.orderType = type;