diff --git a/app.js b/app.js index e0fd14a..845ff83 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.isTest110? true : false; + data.isTest = data.isTest111? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 6990497..366ba51 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -32,6 +32,7 @@ Page({ isCar:'single', showMask: false, price:0, + is_need_idcard:1, }, /** @@ -48,9 +49,10 @@ Page({ flag:options.flag, date:null, ticket_type:app.globalData.product.sku.ticket_type || 1, - isCar:options.isCar + isCar:options.isCar, + is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard }) - console.log('-------',app.globalData.product); + console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); if (!app.globalData.product) { util.back(); @@ -370,12 +372,14 @@ Page({ console.log(this.data) let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product; let linkmanIds = []; - if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) { - wx.showToast({ - title: '请添加出行人', - icon: "none" - }) - return; + if (this.data.is_need_idcard == 1) { + if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) { + wx.showToast({ + title: '请添加出行人', + icon: "none" + }) + return; + } } if (!date && this.data.ticket_type == 1) { wx.showToast({