From 8c5b5490fc8ea304954d65a07bd4b8290c3c4777 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 24 Dec 2019 10:34:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=B6=88=E8=B4=B9=E5=8D=A1?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E4=BB=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 55 ++++++++++++++++++++-------------------- pages/scanPay/scanPay.js | 4 ++- project.config.json | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/ext.json b/ext.json index a0ecc3b..302a6e6 100644 --- a/ext.json +++ b/ext.json @@ -3,68 +3,67 @@ "attr": { "imgProxy": [ { - "newUrl": "https://ciformall.youlane.cn/img", + "newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn" }, { - "newUrl": "https://ciformall.youlane.cn/img1", + "newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn" }, { - "newUrl": "https://ciformall.youlane.cn/img2", + "newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://ciformall.youlane.cn/C/api", - "etcpAppId": "wx192b7d2e8dcbefd0", - "socketUrl": "wss://mp.youlane.cn/W/ws", + "configUrl": "https://c.malls.iformall.com/C/api", + "etcpAppId": "wxc07f9d67923d676d", + "ifStoreApp": "0", "etcpVersion": "release", - "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback", + "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", - "ifStoreApp": "0", "ifHaveCarModular": "1" }, - "name": "富茂客官开发", - "weappId": "wxea71200db93d756b", - "appVersion": "C.4.5.106" + "name": "富茂链客生产版", + "weappId": "wx6a2524a8286d687f", + "appVersion": "C.5.1.1" }, "debug": false, "tabBar": { - "custom": true, "list": [ { - "pagePath": "index/index", + "text": "首页", "iconPath": "assets/images/home.png", - "selectedIconPath": "assets/images/home-a.png", - "text": "首页" + "pagePath": "index/index", + "selectedIconPath": "assets/images/home-a.png" }, { - "pagePath": "index/searchbar", + "text": "门店", "iconPath": "assets/images/mendian.png", - "selectedIconPath": "assets/images/mendian-a.png", - "text": "门店" + "pagePath": "index/searchbar", + "selectedIconPath": "assets/images/mendian-a.png" }, { - "pagePath": "index/passCar", + "text": "停车", "iconPath": "assets/images/park.png", - "selectedIconPath": "assets/images/park-a.png", - "text": "停车" + "pagePath": "index/passCar", + "selectedIconPath": "assets/images/park-a.png" }, { - "pagePath": "index/user", + "text": "我的", "iconPath": "assets/images/user.png", - "selectedIconPath": "assets/images/user-a.png", - "text": "我的" + "pagePath": "index/user", + "selectedIconPath": "assets/images/user-a.png" } - ] + ], + "custom": true }, "window": { "backgroundTextStyle": "dark", "navigationBarTextStyle": "black", - "navigationBarTitleText": "WeChat", - "navigationBarBackgroundColor": "#fff" + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF" }, - "extAppid": "wxea71200db93d756b", + "extAppid": "wx6a2524a8286d687f", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index d9bb6ef..f79cb8f 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -108,8 +108,10 @@ Page({ that.gotoPay(); } else if (res.supportMode == ['fingerPrint']) { checkIsEnrolled(); - } else if (res.supportMode = ['fingerPrint', 'facial']) { + } else if (res.supportMode == ['fingerPrint', 'facial']) { checkIsEnrolled(); + }else{ + that.gotoPay(); } }, fail: (err) => { diff --git a/project.config.json b/project.config.json index cb99eff..53fd519 100644 --- a/project.config.json +++ b/project.config.json @@ -14,7 +14,7 @@ }, "compileType": "miniprogram", "libVersion": "2.5.0", - "appid": "wxb11603577a84a86d", + "appid": "wx453ae0d37f3550d0", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "simulatorType": "wechat",