diff --git a/app.js b/app.js index b1cb39c..7e06a32 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.isTest104? true : false; + data.isTest = data.isTest105? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index 66dd20f..a1a6e93 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -81,7 +81,7 @@ Page({ correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度 callback: (res) => { console.log(res); - codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code}); + codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state}); that.setData({ codeImgs:codeImgs }) diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 604c2f7..4bccaf9 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -19,7 +19,7 @@ - + {{item.state}}