diff --git a/app.js b/app.js index 2d29919..707b737 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest173? true : false; + data.isTest = data.isTest176? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.js b/pages/index/index.js index f0ffd00..2919db8 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -72,6 +72,9 @@ Page({ // 页面图片 imageSourceList:imageSource, + + // 酒店住宿配置链接 /pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/carPurchase + hotelUrl: '' }, onLoad: function(options) { console.log('onload') @@ -1009,7 +1012,32 @@ Page({ this.pagePoint({ event: 'home_view' - }, 1) + }, 1) + + if(!this.data.hotelUrl) { + commonApi._post("pbservice/Other/getClientConfig", { + unique_key: "wechatxcx" + }).then(res => { + try { + let data = JSON.parse(res.data); + if (data.hotelUrl) { + this.setData({ + hotelUrl: data.hotelUrl + }) + } + } catch(e) { + this.setData({ + hotelUrl: '/pages/list/hotel/index' + }) + } + }).catch(err => { + this.setData({ + hotelUrl: '/pages/list/hotel/index' + }) + }) + } + }) + } // this.data.time!=5?wx.showTabBar():1 }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 3714909..53a986e 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -65,15 +65,15 @@ 景点门票 - + - + 夜游苏州 diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 2baeb89..002c8df 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -86,7 +86,7 @@ 出行日期: - {{item.use_date}} {{ item.start_time }}-{{ item.end_time }} + {{item.use_date}}{{ item.start_time }}-{{ item.end_time }}