@@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | |||||
var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
var config = { | 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://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://10.100.33.68:7000/C/api', | ||||
// url: 'http://202.165.179.86:4000/C/api', | // url: 'http://202.165.179.86:4000/C/api', | ||||
api: { | api: { | ||||
@@ -203,7 +203,7 @@ var config = { | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wx649b3be73c1afe47" | |||||
AppId: "wx30caec1cc16c4634" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
@@ -234,15 +234,6 @@ Page({ | |||||
that.countdown(res.data.endTime); | that.countdown(res.data.endTime); | ||||
//当前时间与优惠券下架时间做计算 | //当前时间与优惠券下架时间做计算 | ||||
var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); | 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(); | wx.hideLoading(); | ||||
that.setData({ | that.setData({ | ||||
@@ -1,5 +1,4 @@ | |||||
<view wx:if="{{showPage}}"> | <view wx:if="{{showPage}}"> | ||||
<!-- 券的详情页面 --> | |||||
<view class='coupons'> | <view class='coupons'> | ||||
<view class="coupons-body"> | <view class="coupons-body"> | ||||
<view class='banner'> | <view class='banner'> | ||||
@@ -11,24 +10,6 @@ | |||||
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> | <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> | ||||
</view> | </view> | ||||
<view> | <view> | ||||
<view class='distance' wx:if="{{data.targetAd==2&&data.endTime!=undefined&&data.type!=5}}"> | |||||
<view style='text-align:center;display:inline-block;'> | |||||
<image class='clock' src='{{clockUrl}}' mode='widthFix'></image> | |||||
<text class="qiang">距结束还剩 :</text> | |||||
</view> | |||||
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | |||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | |||||
<text>{{min}}</text>: | |||||
<text>{{sec}}</text> | |||||
</view> | |||||
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | |||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | |||||
<text>{{min}}</text>: | |||||
<text>{{sec}}</text> | |||||
</view> | |||||
</view> | |||||
<text class='title'>{{data.title}}</text> | <text class='title'>{{data.title}}</text> | ||||
<text class="subTitle">{{data.subTitle}}</text> | <text class="subTitle">{{data.subTitle}}</text> | ||||
<view class='salePriceStr clearfix'> | <view class='salePriceStr clearfix'> | ||||
@@ -54,34 +54,34 @@ Page({ | |||||
let that = this; | let that = this; | ||||
wx.scanCode({ | wx.scanCode({ | ||||
success: (res) => { | 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) => { | fail: (res) => { | ||||
console.log(res); | console.log(res); | ||||
@@ -17,13 +17,11 @@ | |||||
<text class="qiang">距结束还剩 :</text> | <text class="qiang">距结束还剩 :</text> | ||||
</view> | </view> | ||||
<view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | <view wx:if="{{clock=='已经截止'||data.remainInventory==0||data.status==1}}" class='times'> | ||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | <text>{{hour}}</text>: | ||||
<text>{{min}}</text>: | <text>{{min}}</text>: | ||||
<text>{{sec}}</text> | <text>{{sec}}</text> | ||||
</view> | </view> | ||||
<view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | <view wx:if="{{clock!='已经截止'&&data.remainInventory!=0}}" class='times'> | ||||
<text>{{day}}</text>天 | |||||
<text>{{hour}}</text>: | <text>{{hour}}</text>: | ||||
<text>{{min}}</text>: | <text>{{min}}</text>: | ||||
<text>{{sec}}</text> | <text>{{sec}}</text> | ||||
@@ -20,7 +20,8 @@ | |||||
<text>{{item.createDate}}</text> | <text>{{item.createDate}}</text> | ||||
</view> | </view> | ||||
<view class='fr'> | <view class='fr'> | ||||
<text wx:if="{{item.scoreAmount>0}}">+{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{item.scoreAmount>0&&item.scoreType==8}}">重置为{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{item.scoreAmount>0&&item.scoreType!=8}}">+{{item.scoreAmount}}分</text> | |||||
<text wx:if="{{0>=item.scoreAmount}}">{{item.scoreAmount}}分</text> | <text wx:if="{{0>=item.scoreAmount}}">{{item.scoreAmount}}分</text> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -78,14 +78,16 @@ | |||||
.content>view:nth-of-type(2n+1) { | .content>view:nth-of-type(2n+1) { | ||||
float: left; | float: left; | ||||
width: 68%; | |||||
width: 60%; | |||||
height: 145rpx; | |||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.content>view:nth-of-type(2n) { | .content>view:nth-of-type(2n) { | ||||
width: 30%; | |||||
width: 38%; | |||||
float: right; | float: right; | ||||
text-align: right; | text-align: right; | ||||
height: 145rpx; | |||||
line-height: 145rpx; | line-height: 145rpx; | ||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
@@ -25,7 +25,7 @@ page { | |||||
} | } | ||||
.merchantName { | .merchantName { | ||||
color: #999; | |||||
color: #666!important; | |||||
} | } | ||||
.tips text:nth-child(2) { | .tips text:nth-child(2) { | ||||
@@ -550,7 +550,7 @@ Page({ | |||||
syncId: res.data.orderId, | syncId: res.data.orderId, | ||||
payType: 6, // 小程序支付 | payType: 6, // 小程序支付 | ||||
CarNumber: carNumber, | CarNumber: carNumber, | ||||
returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
source: "FUMAO-001", | source: "FUMAO-001", | ||||
actionId: "1" //操作ID,1:小程序支付 | actionId: "1" //操作ID,1:小程序支付 | ||||
} | } | ||||
@@ -55,13 +55,15 @@ Page({ | |||||
let that = this; | let that = this; | ||||
const startSoterAuthentication = () => { | const startSoterAuthentication = () => { | ||||
wx.startSoterAuthentication({ | wx.startSoterAuthentication({ | ||||
requestAuthModes: [AUTH_MODE], | |||||
requestAuthModes: ["fingerPrint"], | |||||
challenge: 'test', | challenge: 'test', | ||||
authContent: '请验证已有的指纹以继续', | authContent: '请验证已有的指纹以继续', | ||||
success: (res) => { | success: (res) => { | ||||
console.log(res) | |||||
that.gotoPay() | that.gotoPay() | ||||
}, | }, | ||||
fail: (err) => { | fail: (err) => { | ||||
console.log(err); | |||||
wx.hideLoading(); | wx.hideLoading(); | ||||
that.setData({ | that.setData({ | ||||
showModel: false, | showModel: false, | ||||
@@ -69,6 +71,10 @@ Page({ | |||||
ids: "", | ids: "", | ||||
remainingAmount: that.data.remainingAmounts | remainingAmount: that.data.remainingAmounts | ||||
}) | }) | ||||
if(err.errCode==90008||err.errCode == 90009){ | |||||
}else{ | |||||
that.gotoPay(); | |||||
} | |||||
} | } | ||||
}) | }) | ||||
} | } | ||||
@@ -94,9 +100,9 @@ Page({ | |||||
if (res.supportMode == []) { | if (res.supportMode == []) { | ||||
that.gotoPay(); | that.gotoPay(); | ||||
} else if (res.supportMode == ['fingerPrint']) { | } else if (res.supportMode == ['fingerPrint']) { | ||||
checkIsEnrolled() | |||||
checkIsEnrolled(); | |||||
} else if (res.supportMode = ['fingerPrint', 'facial']) { | } else if (res.supportMode = ['fingerPrint', 'facial']) { | ||||
checkIsEnrolled() | |||||
checkIsEnrolled(); | |||||
} | } | ||||
}, | }, | ||||
fail: (err) => { | fail: (err) => { | ||||
@@ -76,7 +76,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:3.2.1</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:3.2.2</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -92,7 +92,7 @@ function timechuo(startTime) { | |||||
var minute = Math.floor(runTime / 60); | var minute = Math.floor(runTime / 60); | ||||
var runTime = runTime % 60; | var runTime = runTime % 60; | ||||
var second = runTime; | var second = runTime; | ||||
return (day+"天"+hour+"小时"+minute+"分钟") | |||||
return (hour+"小时"+minute+"分钟") | |||||
} | } | ||||