diff --git a/app.js b/app.js index 0ad51d5..7ecc533 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.isTest151? true : false; + data.isTest = data.isTest152? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index e557a89..8feeb80 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -184,7 +184,7 @@ + bindchange="changeBannerIndex" data-keyname="smBannerIndex" circular> diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index c999734..11b92c8 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -1,3 +1,4 @@ + diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index f302080..c9b069c 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -67,7 +67,7 @@ Page({ flag:options.flag, date:null, ticket_type:app.globalData.product.sku.ticket_type || 1, - isCar:options.isCar, + isCar:options.isCar || 'single', is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard, is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0, is_real_name:app.globalData.product.sku.sku_model.is_real_name, @@ -75,7 +75,7 @@ Page({ time: app.globalData.product.time || {}, showYhq:app.globalData.listName?false:true }) - console.log('-------',this.data.product,this.data.time); + console.log('-------',this.data.product,this.data.time, app.globalData); // debugger console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication); diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index e054729..e0d01d4 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -71,7 +71,7 @@ -