diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 2909294..b0071cc 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -857,6 +857,15 @@ Page({ }) }else { + // 如果是预定须知 + if (showSkuIndex == 1) { + this.setData({ + bookingInfo: e.currentTarget.dataset.sku.sku_model, + bookingInfoTitle: e.currentTarget.dataset.sku.sku_name + }) + return + } + let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id) this.setData({ diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index b2962df..38ad34b 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -42,8 +42,8 @@ 预订 - 评价/问答 详情/政策 + 评价/问答 @@ -154,13 +154,14 @@ + 预订选择 预订须知 - + diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 20b4ce1..39bb9fd 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -934,8 +934,8 @@ line-height: 40rpx; } .icon-close { position: absolute; - top: 30rpx; - right: 30rpx; + top: 24rpx; + right: 24rpx; } diff --git a/pages/order/components/date/index.js b/pages/order/components/date/index.js index 423c986..4c17eb6 100644 --- a/pages/order/components/date/index.js +++ b/pages/order/components/date/index.js @@ -169,9 +169,10 @@ Component({ } }) } - + leftIndex = (leftIndex-1)>=0?(leftIndex-1):0; this.setData({ - scrollLeft: 70*leftIndex + // scrollLeft: 70*leftIndex + scrollLeft: "scroll-item-"+leftIndex }) setTimeout(() => { this.changeDate(seldDate) @@ -211,13 +212,16 @@ Component({ }, changeDate: function (e) { let date = e.currentTarget ? e.currentTarget.dataset.date : e + let index = e.currentTarget.dataset.index; if (date.stock <= 0) return; if (date.stock == null) return; if (date.price == null) return; + index = (index-1)>=0?(index-1):0; this.setData({ activeDate: date, moreFlag: true, - date_price:date.price + date_price:date.price, + scrollLeft: "scroll-item-"+index }) this.triggerEvent("onChangeDate", this.data.activeDate) this.getTimeStock() @@ -225,17 +229,20 @@ Component({ // 修改日期 onTapDay: function (e) { let threeDays = this.data.threeDays, flag = false; - threeDays.map(item => { + threeDays.map((item,i) => { if (item.date == e.detail.date) { flag = true } }) + let index = this.data.datelist.findIndex(v=>v.date == e.detail.date) e.detail.short_date = e.detail.date.substr(5, 5); e.detail.date_price = this.data.activeDate.price; + index = (index-1)>=0?(index-1):0; this.setData({ activeDate: e.detail, showMoreDateFlag: false, - moreFlag: flag + moreFlag: flag, + scrollLeft: "scroll-item-"+index }) app.globalData.product.price = this.data.activeDate.price this.triggerEvent("onChangeDate", this.data.activeDate) diff --git a/pages/order/components/date/index.wxml b/pages/order/components/date/index.wxml index db88887..2e274ec 100644 --- a/pages/order/components/date/index.wxml +++ b/pages/order/components/date/index.wxml @@ -28,9 +28,9 @@ 使用日期 - - + {{item.week}} {{item.short_date}}