diff --git a/ext.json b/ext.json index 05c0a59..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -2,44 +2,35 @@ "ext": { "attr": { "car": { - "tjd": { - "payPath": "", - "tjdAppId": "wx6945d1bda68d7993" - }, "etcp": { - "payPath": "pages/pay/order-pay-open/main", - "etcpAppId": "wxc07f9d67923d676d", - "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" - }, - "bolink": { - "payPath": "pages/park/park", - "bolinkAppId": "wxbd08b4baa10fcc1d" - }, - "version": "release" + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } }, - "mchId": "1539496451", + "mchId": "1604439800", "imgProxy": [ { - "newUrl": "https://c.malls.iformall.com/img", + "newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img1", + "newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img2", + "newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://c.malls.iformall.com/C/api", - "ifStoreApp": "0", + "configUrl": "https://ctest.malls.iformall.com/C/api", + "businessSwitch": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "宁乡翡翠湖国际广场", - "weappId": "wxbe89097584fbbf03", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -75,7 +66,8 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "custom": true + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -84,12 +76,16 @@ "navigationBarBackgroundColor": "#FFFFFF" }, "plugins": { + "auto-points-plugin": { + "version": "1.3.0", + "provider": "wxfab2bf944bfc4da6" + }, "live-player-plugin": { - "version": "1.3.5", + "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wxbe89097584fbbf03", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/cardorder/cardUse/cardUse.js b/pages/cardorder/cardUse/cardUse.js index e18e5e0..1dc0977 100644 --- a/pages/cardorder/cardUse/cardUse.js +++ b/pages/cardorder/cardUse/cardUse.js @@ -47,7 +47,7 @@ Page({ isShowQR: false }) } else { - that.getQR(res.data.id, res.data.tenantId) + that.getQR(res.data.id, res.data.tenantId, res.data.wxCardInfo.ownerUserId) } /** @@ -93,9 +93,9 @@ Page({ }, // 获取动态二维码 - getQR(cardId, cardTenantId) { + getQR(cardId, cardTenantId, cUserId) { Http.get({ - url: `/couponOrder/cardDynamicId?cardId=${cardId}&cardTenantId=${cardTenantId}`, + url: `/couponOrder/cardDynamicId?cardId=${cardId}&cardTenantId=${cardTenantId}&cUserId=${cUserId}`, }).then(res => { console.log(res.data); this.setData({ @@ -103,9 +103,9 @@ Page({ }) let url = JSON.stringify({ END: "C", - TYPE: "card", - ID: res.data.dynamicRq, - TENANTID: res.data.cardTenantId + TYPE: "Ecard", + ID: res.data.dynamicId, + TENANTID: res.data.cardTenantId, }) this.createQrCode(url, "qrcode", 350, 350); }).catch(err => { diff --git a/project.config.json b/project.config.json index 59d09e6..a29053e 100644 --- a/project.config.json +++ b/project.config.json @@ -34,7 +34,7 @@ }, "compileType": "miniprogram", "libVersion": "2.11.2", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "C", "simulatorType": "wechat", "simulatorPluginLibVersion": {},