|
|
@@ -92,7 +92,8 @@ Page({ |
|
|
|
const index = e.detail.value |
|
|
|
this.setData({ |
|
|
|
currentIndex: index, |
|
|
|
merchantId: this.data.mallList[index].id |
|
|
|
merchantId: this.data.mallList[index].id, |
|
|
|
reservationMerchantName: '' |
|
|
|
}) |
|
|
|
console.log(this.data.currentIndex, this.data.merchantId); |
|
|
|
}, |
|
|
@@ -316,7 +317,7 @@ Page({ |
|
|
|
data.id = this.data.id |
|
|
|
} |
|
|
|
|
|
|
|
if (this.data.status == 1) { |
|
|
|
if (this.data.status == 1 || this.data.status == '-1') { |
|
|
|
data.status = 0 |
|
|
|
} |
|
|
|
|
|
|
@@ -418,16 +419,16 @@ Page({ |
|
|
|
that.setData({ |
|
|
|
pickedAddress: res.data.userAddress || '请选择地址', |
|
|
|
pickedAddressDetail: res.data.detailedAddress, |
|
|
|
pickedDate: util.timestampToTime(res.data.startDate, 'YYYY-MM-DD'), |
|
|
|
pickedStartTime: util.timestampToTime(res.data.startDate, 'hh:mm'), |
|
|
|
pickedEndTime: util.timestampToTime(res.data.endDate, 'hh:mm'), |
|
|
|
pickedDate: util.timestampToTime(res.data.startDate, 'YYYY-MM-DD') || '请选择日期', |
|
|
|
pickedStartTime: util.timestampToTime(res.data.startDate, 'hh:mm') || '请选择', |
|
|
|
pickedEndTime: util.timestampToTime(res.data.endDate, 'hh:mm') || '请选择', |
|
|
|
describeStr: res.data.describeStr, |
|
|
|
status, |
|
|
|
appointmentText: res.data.status == 1 ? "重新预约" : "修改预约", |
|
|
|
merchantId: res.data.reservationMerchantId, |
|
|
|
reservationMerchantName: res.data.reservationMerchantName |
|
|
|
}) |
|
|
|
if (status == 0 || status == 1 || status == 2 || status == 3) { |
|
|
|
if (status == 0 || status == 1 || status == 2 || status == 3 || status == '-1') { |
|
|
|
that.setData({ |
|
|
|
isShowBtns: true |
|
|
|
}) |
|
|
|