@@ -29,11 +29,8 @@ | |||||
"pages/passCar/couponDetail/couponDetail", | "pages/passCar/couponDetail/couponDetail", | ||||
"pages/managelicenseplate/managelicenseplate", | "pages/managelicenseplate/managelicenseplate", | ||||
"pages/payrule/payrule", | "pages/payrule/payrule", | ||||
<<<<<<< HEAD | |||||
"pages/game/index" | |||||
======= | |||||
"pages/game/index", | |||||
"pages/grade/grade" | "pages/grade/grade" | ||||
>>>>>>> [成长值][增加]:成长值增加 | |||||
], | ], | ||||
"tabBar": { | "tabBar": { | ||||
"color": "#9F9F9F", | "color": "#9F9F9F", | ||||
@@ -192,9 +192,6 @@ Page({ | |||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
console.log(err); | console.log(err); | ||||
console.log(that.data.couponChannelId); | |||||
console.log(that.data.couponId); | |||||
//console.log("我即将要跳转到用户手机号授权的页面"); | |||||
if (err.code == "2011") { | if (err.code == "2011") { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "商户信息没找到", | title: "商户信息没找到", | ||||
@@ -325,25 +322,34 @@ Page({ | |||||
that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 | that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 | ||||
console.log(res); | console.log(res); | ||||
if (res.errMsg == "requestPayment:ok") { | if (res.errMsg == "requestPayment:ok") { | ||||
wx.showToast({ | |||||
title: "购买成功", | |||||
image: "./../../../assets/img/success.png", | |||||
duration: 1000, | |||||
mask: false, | |||||
success: function () { | |||||
setTimeout(function () { | |||||
wx.hideLoading(); | |||||
}, 1600); | |||||
setTimeout(() => { | |||||
wx.navigateTo({ | |||||
url: `/pages/order/detail/index?orderId=${ | |||||
that.data.orderId | |||||
}` | |||||
}); | |||||
}, 1000) | |||||
} | |||||
}); | |||||
// wx.showToast({ | |||||
// title: "购买成功", | |||||
// image: "./../../../assets/img/success.png", | |||||
// duration: 1000, | |||||
// mask: false, | |||||
// success: function () { | |||||
// setTimeout(function () { | |||||
// wx.hideLoading(); | |||||
// }, 2000); | |||||
// setTimeout(() => { | |||||
// wx.navigateTo({ | |||||
// url: `/pages/order/detail/index?orderId=${ | |||||
// that.data.orderId | |||||
// }` | |||||
// }); | |||||
// }, 1000) | |||||
// } | |||||
// }); | |||||
setTimeout(function () { | |||||
wx.hideLoading(); | |||||
}, 2000); | |||||
setTimeout(() => { | |||||
wx.navigateTo({ | |||||
url: `/pages/order/detail/index?orderId=${ | |||||
that.data.orderId | |||||
}` | |||||
}); | |||||
}, 1000) | |||||
/** | /** | ||||
* 用户支付成功以后跳转到券包列表 | * 用户支付成功以后跳转到券包列表 | ||||
*/ | */ | ||||
@@ -405,22 +411,22 @@ Page({ | |||||
key: 'couponNum', | key: 'couponNum', | ||||
data: "couponNum" | data: "couponNum" | ||||
}) | }) | ||||
wx.showToast({ | |||||
title: "领取成功", | |||||
image: "./../../../assets/img/success.png", | |||||
duration: 1000, | |||||
mask: false, | |||||
success: function () { | |||||
setTimeout(function () { | |||||
wx.navigateTo({ | |||||
url: `/pages/order/detail/index?orderId=${ | |||||
that.data.orderId | |||||
}` | |||||
}); | |||||
}, 1000) | |||||
} | |||||
}); | |||||
// wx.showToast({ | |||||
// title: "领取成功", | |||||
// image: "./../../../assets/img/success.png", | |||||
// duration: 1000, | |||||
// mask: false, | |||||
// success: function () { | |||||
// } | |||||
// }); | |||||
setTimeout(function () { | |||||
wx.navigateTo({ | |||||
url: `/pages/order/detail/index?orderId=${ | |||||
that.data.orderId | |||||
}` | |||||
}); | |||||
}, 1000) | |||||
//////////////////////////停车券 | //////////////////////////停车券 | ||||
console.log(that.data.data.type) | console.log(that.data.data.type) | ||||
if (that.data.data.type == 5) { | if (that.data.data.type == 5) { | ||||
@@ -62,12 +62,12 @@ | |||||
<view class='quanyi'> | <view class='quanyi'> | ||||
<view class='part' wx:for="{{levelList}}" wx:key="{{index}}"> | <view class='part' wx:for="{{levelList}}" wx:key="{{index}}"> | ||||
<view class='clearfix'> | <view class='clearfix'> | ||||
<image wx:if="{{index==0}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png" ></image> | |||||
<image wx:if="{{index==1}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade1.png" ></image> | |||||
<image wx:if="{{index==2}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade2.png" ></image> | |||||
<image wx:if="{{index==3}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade3.png" ></image> | |||||
<image wx:if="{{index==4}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png" ></image> | |||||
<image wx:if="{{index==5}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png" ></image> | |||||
<image wx:if="{{index==0}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png"></image> | |||||
<image wx:if="{{index==1}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade1.png"></image> | |||||
<image wx:if="{{index==2}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade2.png"></image> | |||||
<image wx:if="{{index==3}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade3.png"></image> | |||||
<image wx:if="{{index==4}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png"></image> | |||||
<image wx:if="{{index==5}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png"></image> | |||||
<text class='titles fl'>{{item.level}}</text> | <text class='titles fl'>{{item.level}}</text> | ||||
</view> | </view> | ||||
<view class='des' wx:if="{{item.description==''}}">无</view> | <view class='des' wx:if="{{item.description==''}}">无</view> | ||||
@@ -61,7 +61,7 @@ Page({ | |||||
}); | }); | ||||
setTimeout(function () { | setTimeout(function () { | ||||
wx.hideLoading(); | wx.hideLoading(); | ||||
}, 500); | |||||
}, 1500); | |||||
// that.data.setInter = setInterval(function() { | // that.data.setInter = setInterval(function() { | ||||
Http.get({ | Http.get({ | ||||