diff --git a/config/config.js b/config/config.js index ec73d1c..471ef0a 100755 --- a/config/config.js +++ b/config/config.js @@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { // url: "https://ciformall.youlane.cn/C/api", - // url:"https://c.malls.iformall.com/C/api", - url:'https://ctest.malls.iformall.com/C/api', + url:"https://c.malls.iformall.com/C/api", + // url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.68:7000/C/api', // url: 'http://202.165.179.86:4000/C/api', api: { @@ -203,7 +203,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wx30caec1cc16c4634" }, ErrorCode: { diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index ea47922..31c2ddf 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -54,17 +54,15 @@ Page({ let that = this; wx.scanCode({ success: (res) => { - console.log(JSON.parse(res.result).merchant_id_scan) - let merchant_id_scan = JSON.parse(res.result).merchant_id_scan; - if(merchant_id_scan){ + console.log(res.result.indexOf('merchant_id_scan')) + if(res.result.indexOf('merchant_id_scan')!=-1){ Http.get({ url: config.api.findByCode, data: { - merchantCode: merchant_id_scan, + merchantCode: JSON.parse(res.result).merchant_id_scan, } }) .then(res => { - console.log(res); if (res.code == 200) { let merChantDetail = JSON.stringify(res.data); if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) { diff --git a/project.config.json b/project.config.json index 8a03963..2ff403f 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", + "appid": "wx30caec1cc16c4634", "projectname": "C", "isGameTourist": false, "condition": {