diff --git a/app.js b/app.js index 3199bb7..73e4dbc 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.isTest81? true : false; + data.isTest = data.isTest82? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js index 7481d63..53f5e68 100644 --- a/pages/order/pay/index.js +++ b/pages/order/pay/index.js @@ -17,7 +17,8 @@ Page({ showNumMask: false, activePay:false,//是否活动支付 SUBWALLET:false, - wxPay:false + wxPay:false, + isBook:false }, /** @@ -81,6 +82,12 @@ Page({ commonApi.user_post("order/query",{ order_id:this.data.id }).then(res=>{ + // 书券产品 + if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013){ + this.setData({ + isBook:true + }) + } if(res.data.create_time && res.data.auto_close_time && res.data.state=='UNPAID'){ let time = (new Date(res.data.create_time.replace(/-/g,'/')).getTime() + Number(res.data.auto_close_time) * 1000); this.daojishi(time); diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml index 834cbb6..80c6d17 100644 --- a/pages/order/pay/index.wxml +++ b/pages/order/pay/index.wxml @@ -28,7 +28,7 @@ 支付方式: - + 微信支付