From 5e966d4823e748f819c14bfd2bf9d20bb19b42a5 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Mon, 7 Jan 2019 21:04:35 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E6=8C=87=E7=BA=B9=E8=AF=86?=
=?UTF-8?q?=E5=88=AB=E7=9A=84=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 6 ++--
pages/scanPay/scanPay.js | 60 ++++++----------------------------------
pages/user/index.wxml | 2 +-
project.config.json | 2 +-
4 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/config/config.js b/config/config.js
index 006b46a..98502ba 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,9 +1,9 @@
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
var appId = extConfig.appId;
var config = {
- url: "https://ciformall.youlane.cn/C/api",
+ // 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://ctest.malls.iformall.com/C/api',
// url:'http://10.100.33.68:7000/C/api',
// url: 'http://10.100.30.172:7000/C/api',
api: {
@@ -199,7 +199,7 @@ var config = {
},
weapp: {
- AppId: "wxea71200db93d756b"
+ AppId: "wx649b3be73c1afe47"
},
ErrorCode: {
diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js
index 44603d9..2e80e34 100644
--- a/pages/scanPay/scanPay.js
+++ b/pages/scanPay/scanPay.js
@@ -34,57 +34,6 @@ Page({
},
gotoPayMoney: function (flags) {
let that = this;
- // 卡余额充足的时候,才可以付钱
- // if(e){
- // if(e.currentTarget.dataset.flags == 'check'){
- // console.log("frhufr")
- // that.setData({
- // ids: e.currentTarget.dataset.id,
- // cardid: e.currentTarget.dataset.id,
- // remainingAmount: e.currentTarget.dataset.remainingamount,
- // })
- // const startSoterAuthentication = () => {
- // wx.startSoterAuthentication({
- // requestAuthModes: [AUTH_MODE],
- // challenge: 'test',
- // authContent: '请验证已有的指纹以继续',
- // success: (res) => {
- // that.gotoPayMoney()
- // },
- // fail: (err) => {
-
- // }
- // })
- // }
- // const checkIsEnrolled = () => {
- // wx.checkIsSoterEnrolledInDevice({
- // checkAuthMode: AUTH_MODE,
- // success: (res) => {
- // console.log(res)
- // if (parseInt(res.isEnrolled) <= 0) {
- // that.gotoPayMoney();
- // return
- // }
- // startSoterAuthentication();
- // },
- // fail: (err) => {
- // console.error(err)
- // }
- // })
- // }
- // wx.checkIsSupportSoterAuthentication({
- // success: (res) => {
- // console.log(res)
- // checkIsEnrolled()
- // },
- // fail: (err) => {
- // console.error(err);
- // that.gotoPayMoney();
- // }
- // })
- // }
- // }
-
const startSoterAuthentication = () => {
wx.startSoterAuthentication({
requestAuthModes: [AUTH_MODE],
@@ -117,13 +66,20 @@ Page({
wx.checkIsSupportSoterAuthentication({
success: (res) => {
console.log(res)
- checkIsEnrolled()
+ if(res.supportMode == []){
+ that.gotoPay();
+ }else if(res.supportMode == ['fingerPrint']){
+ checkIsEnrolled()
+ }else if(res.supportMode = ['fingerPrint', 'facial'] ){
+ that.gotoPay();
+ }
},
fail: (err) => {
console.error(err);
that.gotoPay();
}
})
+
},
gotoPay: function () {
let that = this;
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index e32fc0b..a852b45 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -76,7 +76,7 @@
- 版本号:3.2.3
+ 版本号:3.3.0
diff --git a/project.config.json b/project.config.json
index 4e30ca0..2970aaf 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
- "appid": "wxea71200db93d756b",
+ "appid": "wx649b3be73c1afe47",
"projectname": "C",
"isGameTourist": false,
"condition": {