| @@ -3,15 +3,15 @@ | |||||
| "attr": { | "attr": { | ||||
| "configUrl": "https://ctest.malls.iformall.com/C/api" | "configUrl": "https://ctest.malls.iformall.com/C/api" | ||||
| }, | }, | ||||
| "name": "富茂券券集团版", | |||||
| "weappId": "tt620e14b3fd30264101" | |||||
| "name": "富茂家政", | |||||
| "weappId": "tt90b5e6080f896bde01" | |||||
| }, | }, | ||||
| "window": { | "window": { | ||||
| "backgroundTextStyle": "light", | "backgroundTextStyle": "light", | ||||
| "navigationBarTextStyle": "black", | "navigationBarTextStyle": "black", | ||||
| "navigationBarBackgroundColor": "#fff" | "navigationBarBackgroundColor": "#fff" | ||||
| }, | }, | ||||
| "extAppid": "tt620e14b3fd30264101", | |||||
| "extAppid": "tt90b5e6080f896bde01", | |||||
| "extEnable": true, | "extEnable": true, | ||||
| "directCommit": false, | "directCommit": false, | ||||
| "networkTimeout": { | "networkTimeout": { | ||||
| @@ -9,7 +9,7 @@ Page({ | |||||
| appointmentText: "确认预约", | appointmentText: "确认预约", | ||||
| id: "", | id: "", | ||||
| orderId: "", | orderId: "", | ||||
| startTime: "", | |||||
| startTime: '', | |||||
| endTime: "", | endTime: "", | ||||
| mallTenantId: "", | mallTenantId: "", | ||||
| pickedAddress: "请选择地址", | pickedAddress: "请选择地址", | ||||
| @@ -21,14 +21,27 @@ Page({ | |||||
| isShowBtns: false | isShowBtns: false | ||||
| }, | }, | ||||
| onLoad(options) { | onLoad(options) { | ||||
| console.log(options, 'options'); | |||||
| console.log(options, 'options') | |||||
| const date = (new Date()).getTime() | |||||
| const nowDate = util.timestampToTime(date, 'YYYY-MM-DD') | |||||
| const startTime = util.timestampToTime(options.startTime * 1, 'YYYY-MM-DD') | |||||
| console.log(nowDate, startTime, 'time'); | |||||
| const finalStartTime = options.startTime * 1 > date * 1 ? startTime : nowDate | |||||
| console.log(finalStartTime, 'finalStartTime'); | |||||
| this.setData({ | this.setData({ | ||||
| id: options.id || '', | id: options.id || '', | ||||
| orderId: options.orderId || '', | orderId: options.orderId || '', | ||||
| startTime: options.startTime || '', | |||||
| startTime: finalStartTime, | |||||
| endTime: options.endTime || '' | endTime: options.endTime || '' | ||||
| }) | }) | ||||
| console.log(this.data.startTime, 'startTime'); | |||||
| const mallTenantId = tt.getStorageSync('mallTenantId'); | const mallTenantId = tt.getStorageSync('mallTenantId'); | ||||
| if (mallTenantId) { | if (mallTenantId) { | ||||
| this.setData({ | this.setData({ | ||||
| @@ -185,7 +185,7 @@ Page({ | |||||
| const that = this | const that = this | ||||
| const orderId = e.currentTarget.dataset.id | const orderId = e.currentTarget.dataset.id | ||||
| const id = this.data.appointmentId | const id = this.data.appointmentId | ||||
| const startTime = that.data.order.validStartDate | |||||
| const startTime = that.data.order.validStartDATE | |||||
| const endTime = that.data.order.validEndDate | const endTime = that.data.order.validEndDate | ||||
| console.log(startTime, endTime); | console.log(startTime, endTime); | ||||
| @@ -446,7 +446,10 @@ Page({ | |||||
| tempData.soldStartTime = util.timestampToTime(tempData.soldStartTime, "YYYY-MM-DD") || null, | tempData.soldStartTime = util.timestampToTime(tempData.soldStartTime, "YYYY-MM-DD") || null, | ||||
| tempData.soldEndTime = util.timestampToTime(tempData.soldEndTime, "YYYY-MM-DD") || null, | tempData.soldEndTime = util.timestampToTime(tempData.soldEndTime, "YYYY-MM-DD") || null, | ||||
| tempData.validStartDate = util.timestampToTime(tempData.validStartDate, "YYYY-MM-DD") | |||||
| tempData.validStartDATE = tempData.validStartDate | |||||
| tempData.validEndDATE = tempData.validEndDate | |||||
| tempData.validStartDate = util.timestampToTime(tempData.validStartDate, "YYYY-MM-DD") | |||||
| tempData.validEndDate = util.timestampToTime(tempData.validEndDate, "YYYY-MM-DD") | tempData.validEndDate = util.timestampToTime(tempData.validEndDate, "YYYY-MM-DD") | ||||
| tempData.couponOrderIdS = tempData.couponOrderId ? tempData.couponOrderId.slice(0, 4) + `******` + tempData.couponOrderId.slice(14) : '' | tempData.couponOrderIdS = tempData.couponOrderId ? tempData.couponOrderId.slice(0, 4) + `******` + tempData.couponOrderId.slice(14) : '' | ||||