Commit 3b7f1e29 authored by Facius's avatar Facius

预约报备bug修复

parent 3b230076
(function () { (function () {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null;
let VERSION_NUMBER = '1.3.13';//版本号 let VERSION_NUMBER = '1.3.12';//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -143,6 +143,9 @@ ...@@ -143,6 +143,9 @@
this.initAppointRange() this.initAppointRange()
this.currentDayIndex = index this.currentDayIndex = index
this.$emit('date-change', data) this.$emit('date-change', data)
if (this.appointRange) {
this.$emit('time-change', {item:{pkey:this.appointRange, name:this.appointRangeText}})
}
}, },
timeChange(item, index, list) { timeChange(item, index, list) {
let data = { let data = {
......
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
self.showRemark = true; self.showRemark = true;
if (self.dateList && self.timeList) { if (self.dateList && self.timeList) {
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
if (self.dateItem if (self.dateItem && self.dateItem.timeRange
&& self.dateItem.timeRange.indexOf(item.pkey) > -1 || item.isEnd) { && self.dateItem.timeRange.indexOf(item.pkey) > -1 || item.isEnd) {
item.disabled = true; item.disabled = true;
} else { } else {
...@@ -326,7 +326,7 @@ export default { ...@@ -326,7 +326,7 @@ export default {
self.dateItem = data.item self.dateItem = data.item
if (self.trace.reasonType == '改约') { if (self.trace.reasonType == '改约') {
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
if (data.item.pkey.indexOf(item.pkey) > -1) { if (data.item.timeRange && data.item.timeRange.indexOf(item.pkey) > -1 || item.isEnd) {
item.disabled = true; item.disabled = true;
} else { } else {
item.disabled = false; item.disabled = false;
...@@ -360,11 +360,17 @@ export default { ...@@ -360,11 +360,17 @@ export default {
let params = this.$u.deepClone(self.trace); let params = this.$u.deepClone(self.trace);
if(self.trace.reasonType != '改约') { if(self.trace.reasonType != '改约') {
if(self.timeItem && self.timeItem.pkey && self.traceDate){ if(self.timeItem && self.timeItem.pkey && self.traceDate){
let traceDate = self.moment(self.traceDate); let traceDate = self.moment(self.traceDate);
let timeArr = self.timeItem.pkey.split("_") let timeArr = self.timeItem.pkey.split("_")
let hours = timeArr && timeArr.length && timeArr.pop() if (self.timeItem.pkey == 'appointment_range_24') {
let traceDateTime = traceDate.clone().add(Number(hours), 'hours'); let traceDateTime = traceDate.clone().add(23, 'hours').add(59, 'minutes')
params.nextTraceDatetime = traceDateTime.unix() * 1000 params.nextTraceDatetime = traceDateTime.unix() * 1000
} else {
let hours = timeArr && timeArr.length && timeArr.pop()
let traceDateTime = traceDate.clone().add(Number(hours), 'hours');
params.nextTraceDatetime = traceDateTime.unix() * 1000
}
} }
} else { } else {
params.appointmentDatetime = self.traceDate params.appointmentDatetime = self.traceDate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment