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/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js index 9ed624a..fbd544e 100644 --- a/pages/cardListDetail/cardListDetail.js +++ b/pages/cardListDetail/cardListDetail.js @@ -234,15 +234,6 @@ Page({ that.countdown(res.data.endTime); //当前时间与优惠券下架时间做计算 var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); - if (util.timechuo(endTime).indexOf('-') == 0) { - that.setData({ - endtime: "活动已结束", - }); - } else { - that.setData({ - endtime: util.timechuo(endTime) - }); - } } wx.hideLoading(); that.setData({ diff --git a/pages/cardListDetail/cardListDetail.wxml b/pages/cardListDetail/cardListDetail.wxml index 967030a..c734129 100644 --- a/pages/cardListDetail/cardListDetail.wxml +++ b/pages/cardListDetail/cardListDetail.wxml @@ -1,5 +1,4 @@ - - - - - 距结束还剩 : - - - {{day}}天 - {{hour}}: - {{min}}: - {{sec}} - - - {{day}}天 - {{hour}}: - {{min}}: - {{sec}} - - {{data.title}} {{data.subTitle}} diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 7ee7c27..31c2ddf 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -54,34 +54,34 @@ Page({ let that = this; wx.scanCode({ success: (res) => { - console.log(res.result) - Http.get({ - url: config.api.findByCode, - data: { - merchantCode: res.result, - } - }) - .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) { - wx.navigateTo({ - url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, - }) - } else { - wx.showToast({ - title: "未识别到商户二维码", - icon: "none", - mask: false - }) - } + console.log(res.result.indexOf('merchant_id_scan')) + if(res.result.indexOf('merchant_id_scan')!=-1){ + Http.get({ + url: config.api.findByCode, + data: { + merchantCode: JSON.parse(res.result).merchant_id_scan, } }) - .catch(err => { - console.log(err) + .then(res => { + if (res.code == 200) { + let merChantDetail = JSON.stringify(res.data); + if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) { + wx.navigateTo({ + url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, + }) + } + } + }) + .catch(err => { + console.log(err) + }) + }else{ + wx.showToast({ + title: "未识别到商户二维码", + icon: "none", + mask: false }) - + } }, fail: (res) => { console.log(res); diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index cdbc7db..eded453 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -17,13 +17,11 @@ 距结束还剩 : - {{day}}{{hour}}: {{min}}: {{sec}} - {{day}}{{hour}}: {{min}}: {{sec}} diff --git a/pages/czdetail/czdetail.wxml b/pages/czdetail/czdetail.wxml index 6dc1630..85f7f33 100644 --- a/pages/czdetail/czdetail.wxml +++ b/pages/czdetail/czdetail.wxml @@ -20,7 +20,8 @@ {{item.createDate}} - +{{item.scoreAmount}}分 + 重置为{{item.scoreAmount}}分 + +{{item.scoreAmount}}分 {{item.scoreAmount}}分 diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss index 0db4b49..0bf9d0c 100644 --- a/pages/czdetail/czdetail.wxss +++ b/pages/czdetail/czdetail.wxss @@ -78,14 +78,16 @@ .content>view:nth-of-type(2n+1) { float: left; - width: 68%; + width: 60%; + height: 145rpx; overflow: hidden; } .content>view:nth-of-type(2n) { - width: 30%; + width: 38%; float: right; text-align: right; + height: 145rpx; line-height: 145rpx; overflow: hidden; } diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 1546101..0b8a613 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -25,7 +25,7 @@ page { } .merchantName { - color: #999; + color: #666!important; } .tips text:nth-child(2) { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 6f3c594..2753b10 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -550,7 +550,7 @@ Page({ syncId: res.data.orderId, payType: 6, // 小程序支付 CarNumber: carNumber, - returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", + returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", source: "FUMAO-001", actionId: "1" //操作ID,1:小程序支付 } diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index be18dbf..aac5a4d 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -55,13 +55,15 @@ Page({ let that = this; const startSoterAuthentication = () => { wx.startSoterAuthentication({ - requestAuthModes: [AUTH_MODE], + requestAuthModes: ["fingerPrint"], challenge: 'test', authContent: '请验证已有的指纹以继续', success: (res) => { + console.log(res) that.gotoPay() }, fail: (err) => { + console.log(err); wx.hideLoading(); that.setData({ showModel: false, @@ -69,6 +71,10 @@ Page({ ids: "", remainingAmount: that.data.remainingAmounts }) + if(err.errCode==90008||err.errCode == 90009){ + }else{ + that.gotoPay(); + } } }) } @@ -94,9 +100,9 @@ Page({ if (res.supportMode == []) { that.gotoPay(); } else if (res.supportMode == ['fingerPrint']) { - checkIsEnrolled() + checkIsEnrolled(); } else if (res.supportMode = ['fingerPrint', 'facial']) { - checkIsEnrolled() + checkIsEnrolled(); } }, fail: (err) => { diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 1232167..7c73334 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -76,7 +76,7 @@ - 版本号:3.2.1 + 版本号:3.2.2 diff --git a/utils/util.js b/utils/util.js index 22eafea..742b373 100644 --- a/utils/util.js +++ b/utils/util.js @@ -92,7 +92,7 @@ function timechuo(startTime) { var minute = Math.floor(runTime / 60); var runTime = runTime % 60; var second = runTime; - return (day+"天"+hour+"小时"+minute+"分钟") + return (hour+"小时"+minute+"分钟") }