diff --git a/app.js b/app.js index 8f07bc1..4267b37 100644 --- a/app.js +++ b/app.js @@ -38,7 +38,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest115? true : false; + data.isTest = data.isTest114? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 357c02e..2909294 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -58,6 +58,8 @@ Page({ noticeIndex: 0, skuPriceDate: [], + skuShowIndex: 0, + skuShowDomId: "", }, /** @@ -327,17 +329,17 @@ Page({ }) }, showBookingInfo: function (e) { - this.setData({ - bookingInfo: e.currentTarget.dataset.item.sku_model, - bookingInfoTitle: e.currentTarget.dataset.item.sku_name - }) - util.pagePoint({ - event: "scene_notice", - param: { - type: this.data.info.type, - id: this.data.info.id - } - }, 1) + // this.setData({ + // bookingInfo: e.currentTarget.dataset.item.sku_model, + // bookingInfoTitle: e.currentTarget.dataset.item.sku_name + // }) + // util.pagePoint({ + // event: "scene_notice", + // param: { + // type: this.data.info.type, + // id: this.data.info.id + // } + // }, 1) }, closeMask: function () { this.setData({ @@ -826,6 +828,9 @@ Page({ } console.log(app.globalData.product); console.log(ticket_type); + + let showSkuIndex = e.currentTarget.dataset.index || 0 + if (ticket_type != 2) { let today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000)); @@ -844,7 +849,9 @@ Page({ orderSku: e.currentTarget.dataset.sku, orderProduct: e.currentTarget.dataset.product, noticeIndex: 0, - skuPriceDate: res.data + skuPriceDate: res.data, + skuShowIndex:showSkuIndex, + skuShowDomId:"sku-show-"+showSkuIndex, }) } }) @@ -1028,6 +1035,23 @@ Page({ }) }, + changeSimpleVal (e) { + let keyname = e.currentTarget.dataset.keyname; + let val = e.currentTarget.dataset.val; + let param = {} + param[keyname] = val + + if (keyname == "skuShowIndex") { + param.skuShowDomId = "sku-show-0" + if (val == 1) { + param.skuShowDomId = "sku-show-1" + } + } + + this.setData(param) + console.log(this.data) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 70ed99d..b2962df 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -74,7 +74,9 @@ {{sku.display_tags_str}} - ⓘ预订须知> + ⓘ预订须知> @@ -84,7 +86,7 @@ 预订 @@ -152,23 +154,30 @@ - - - - - 预订须知 - - 预订须知 - 产品详情 + + 预订选择 + 预订须知 - - - - - + + + + + + + 预订须知 + + 预订须知 + 产品详情 + + + + + + + 合计: {{showPrice/100}} diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 6e92015..20b4ce1 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -926,9 +926,11 @@ line-height: 40rpx; bottom: 0; width: 100%; background: white; - border-radius: 12rpx; + /* border-radius: 12rpx; */ overflow-y: auto; height: 85vh; + display: flex; + flex-direction: column; } .icon-close { position: absolute; @@ -1003,7 +1005,7 @@ line-height: 93rpx; .scroll-menus{ - padding: 0rpx 33rpx 26rpx; + padding: 26rpx 33rpx 26rpx; display: flex; justify-content: space-between; align-items: center; @@ -1031,5 +1033,45 @@ line-height: 93rpx; margin-bottom: 30rpx; } .orderNotice{ - padding: 0 25rpx 0 35rpx; + padding: 20rpx 25rpx 0 35rpx; +} + +.mask-top-menu{ + width: 100%; + height: 84rpx; + background: #FFFFFF; + font-weight: 500; + font-size: 31rpx; + color: #000000; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 1rpx solid #D8D8D8; + padding: 0 128rpx; + box-sizing: border-box; + flex-shrink: 0; +} +.mask-top-menu>view{ + height: 84rpx; + line-height: 84rpx; + min-width: 121rpx; +} +.mask-top-menu>view.active{ + color: #0B898E; + border-bottom: 4rpx solid #0B898E; +} +.mask-content1 .date-box .box-title{ + font-weight: bold; + font-size: 37rpx; + color: #000000; +} + +.mask-content1 .date-box>view:nth-of-type(2){ + border: none !important; + padding-top: 10rpx !important; + height: auto !important; +} +.mask-scroll-content{ + flex: 1; + height: 100rpx; } \ No newline at end of file