diff --git a/app.js b/app.js index 4267b37..5cf47f2 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.isTest114? true : false; + data.isTest = data.isTest126? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 546ed64..c8bbb02 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,7 +4,7 @@ - @@ -70,7 +70,7 @@ - @@ -134,7 +134,7 @@ - @@ -152,7 +152,7 @@ - @@ -286,7 +286,7 @@ - + @@ -321,7 +321,7 @@ - @@ -347,7 +347,7 @@ - @@ -361,7 +361,7 @@ - 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/list/six/index.js b/pages/list/six/index.js index e788f1d..846d455 100644 --- a/pages/list/six/index.js +++ b/pages/list/six/index.js @@ -1,6 +1,7 @@ // pages/list/six/index.js let app = getApp() +import { unix } from "dayjs" import commonApi from "../../../utils/https/common" import util from "../../../utils/util" Page({ @@ -15,7 +16,7 @@ Page({ typeIndex:0, total:1, list:[], - keywords:"" + keywords:"", }, /** @@ -143,6 +144,12 @@ Page({ console.log(item) util.gotoDetail(item); }, + goHotel () { + wx.navigateToMiniProgram({ + appId : "wx0e6ed4f51db9d078", + page: "/pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063" + }) + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml index a33d90b..3085b3c 100644 --- a/pages/list/six/index.wxml +++ b/pages/list/six/index.wxml @@ -28,10 +28,15 @@ 景点门票 - + + + + 酒店住宿 + + {{item.week}} {{item.short_date}} diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 34a9eb6..cbd6b5b 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -9,8 +9,10 @@ 苏康码 --> - + + 高峰预警 diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js index 67bd108..d4f67ce 100644 --- a/pages/pbService/sceneComfort/index.js +++ b/pages/pbService/sceneComfort/index.js @@ -53,7 +53,7 @@ Page({ commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{ let areaObj = {} res.data.forEach(item=>{ - item.area_code = item.area + item.area_code = item.area_code item.area_name = item.area areaObj[item.area_code] = item.area; })