diff --git a/app.js b/app.js index a70fde6..e1789b7 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.isTest79? true : false; + data.isTest = data.isTest80? 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 3e293b9..b06dc2b 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -27,7 +27,7 @@ Page({ sysm:false, sysmText:'更多', sysm2:false, - sysm2Text:'更多', + sysm2Text:'更多' }, /** @@ -48,38 +48,46 @@ Page({ }) }, getCodeImg:function(){ - let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[]; + let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0; + this.data.info.order_product_list.forEach(qrcode=>{ - qrcode.qrcode.map((item,index)=>{ - if(item.use_url){ - codeImgs.push(item.use_url); - if(codeImgs.length==qrcode.qrcode.length){ - that.setData({ - codeImgs:codeImgs - }) - } + qrcode.qrcode.map((item)=>{ + if(item.use_url&&item.use_code){ + codeImgs.push({img:item.use_url,code:item.use_code,text:item.use_code_display_text,state:item.stateText}); + // if(codeImgs.length==qrcode.qrcode.length){ + // that.setData({ + // codeImgs:codeImgs + // }) + // } + that.setData({ + codeImgs:codeImgs + }) } else { - new QRCode('damocode'+index,{ + console.log(1231231232131); + console.log(codeId); + new QRCode('damocode'+codeId,{ text: item.use_code, width: 300 * radio, height: 300 * radio, - padding: 12, // 生成二维码四周自动留边宽度,不传入默认为0 - correctLevel: QRCode.CorrectLevel.L, // 二维码可辨识度 + padding:10, // 生成二维码四周自动留边宽度,不传入默认为0 + correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度 callback: (res) => { - codeImgs.push(res.path); - if(codeImgs.length==qrcode.qrcode.length){ - that.setData({ - codeImgs:codeImgs - }) - } + codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText}); + that.setData({ + codeImgs:codeImgs + }) + + // if(codeImgs.length==qrcode.qrcode.length){ + + // } } }) + codeId = codeId + 1 } }) }) - }, prevCodeImg:function(){ let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex; @@ -95,13 +103,15 @@ Page({ } }, nextCodeImg:function(){ - let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex; + console.log(this.data.codeImgs); + let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex; codeIndex = codeIndex + 1; if(codeIndex==qrcode.length){ codeIndex = 0; } this.setData({ codeIndex:codeIndex + }) }, showFeeInfo:function(){ diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 2512257..1e497f9 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -2,19 +2,26 @@ - + {{info.state_text}} - + {{info.order_product_list[0].qrcode[codeIndex].use_code_display_text}}:{{info.order_product_list[0].qrcode[codeIndex].use_code}} 核销码:{{info.order_product_list[0].qrcode[codeIndex].use_code}} {{info.order_product_list[0].qrcode[codeIndex].stateText}} {{codeIndex+1}}/{{codeImgs.length}} - + --> + + + + + + + {{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}} + {{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}