diff --git a/package2/pages/appointment/appointment.js b/package2/pages/appointment/appointment.js index e491814..c42fcb3 100644 --- a/package2/pages/appointment/appointment.js +++ b/package2/pages/appointment/appointment.js @@ -17,6 +17,9 @@ Page({ pickedStartTime: "请选择", pickedEndTime: "请选择", describeStr: "", + mallList: [], + merchantId: "", + currentIndex: "", status: "", isShowBtns: false }, @@ -37,10 +40,11 @@ Page({ id: options.id || '', orderId: options.orderId || '', startTime: finalStartTime, - endTime: options.endTime || '' + endTime: options.endTime || '', + mallList: JSON.parse(options.mallList)[0].merchantVoList || '', }) - console.log(this.data.startTime, 'startTime'); + console.log(this.data.mallList, 'mallList'); const mallTenantId = tt.getStorageSync('mallTenantId'); if (mallTenantId) { @@ -58,6 +62,16 @@ Page({ } }, + setMerchant(e) { + console.log(e.detail.value, 'e'); + const index = e.detail.value + this.setData({ + currentIndex: index, + merchantId: this.data.mallList[index].id + }) + console.log(this.data.currentIndex, this.data.merchantId); + }, + chooseAddress() { if (!this.data.isShowBtns) return let that = this; @@ -142,7 +156,8 @@ Page({ startDate: tempData.pickedDate + " " + tempData.pickedStartTime + ":00", endDate: tempData.pickedDate + " " + tempData.pickedEndTime + ":00", describeStr: tempData.describeStr, - mallTenantId: tempData.mallTenantId || '' + mallTenantId: tempData.mallTenantId || '', + reservationMerchantId: tempData.merchantId } if (this.data.id) { diff --git a/package2/pages/appointment/appointment.ttml b/package2/pages/appointment/appointment.ttml index a108828..0027137 100644 --- a/package2/pages/appointment/appointment.ttml +++ b/package2/pages/appointment/appointment.ttml @@ -32,6 +32,20 @@ + + 选择可用商户: + + + 请选择 + + + + {{ mallList[currentIndex].merchantName }} + + + + diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 52b068b..295b6c5 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -187,11 +187,11 @@ Page({ const id = this.data.appointmentId const startTime = that.data.order.validStartDATE const endTime = that.data.order.validEndDate - - console.log(startTime, endTime); + const mallList = JSON.stringify(that.data.mallList) + console.log(startTime, endTime, mallList); tt.navigateTo({ - url: `/package2/pages/appointment/appointment?id=${id}&orderId=${orderId}&startTime=${startTime}&endTime=${endTime}`, + url: `/package2/pages/appointment/appointment?id=${id}&orderId=${orderId}&startTime=${startTime}&endTime=${endTime}&mallList=${mallList}`, }); }, diff --git a/project.private.config.json b/project.private.config.json index 4a6bb79..66cf51b 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -56,15 +56,6 @@ "scene": "011007", "launchFrom": "scan", "location": "audit" - }, - { - "id": 1686207127735, - "name": "预约功能调试", - "pathName": "package2/pages/appointment/appointment", - "query": "id=826355515227168768&startTime=2023-05-29&endTime=2023-06-28", - "scene": "990001", - "launchFrom": "scan", - "location": "qr_code" } ] }