|
@@ -63,7 +63,8 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<uniPopup ref="popup1" type="dialog">
|
|
<uniPopup ref="popup1" type="dialog">
|
|
- <uni-popup-dialog
|
|
|
|
|
|
+ <uni-popup-dialog
|
|
|
|
+ :isSkm="isSkm"
|
|
mode="input"
|
|
mode="input"
|
|
type="input"
|
|
type="input"
|
|
title="支付"
|
|
title="支付"
|
|
@@ -71,7 +72,8 @@
|
|
:duration="2000"
|
|
:duration="2000"
|
|
:before-close="true"
|
|
:before-close="true"
|
|
@close="close"
|
|
@close="close"
|
|
- @confirm="confirm"
|
|
|
|
|
|
+ @confirm="confirm"
|
|
|
|
+ @changeShowPayType="changeShowPayType"
|
|
></uni-popup-dialog>
|
|
></uni-popup-dialog>
|
|
</uniPopup>
|
|
</uniPopup>
|
|
<uniPopup ref="popup2" type="message"><uni-popup-message type="success" message="支付成功" :duration="2000"></uni-popup-message></uniPopup>
|
|
<uniPopup ref="popup2" type="message"><uni-popup-message type="success" message="支付成功" :duration="2000"></uni-popup-message></uniPopup>
|
|
@@ -135,6 +137,7 @@ export default {
|
|
// #endif
|
|
// #endif
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ isSkm: false,
|
|
showPayType: 0,
|
|
showPayType: 0,
|
|
payType: 0,//付款码type 0-余额 1-消费券 2-积分
|
|
payType: 0,//付款码type 0-余额 1-消费券 2-积分
|
|
payTypeShow:0,//付款码type 0-余额 1-消费券 2-积分
|
|
payTypeShow:0,//付款码type 0-余额 1-消费券 2-积分
|
|
@@ -413,7 +416,8 @@ export default {
|
|
this.receivedCollectionCode();
|
|
this.receivedCollectionCode();
|
|
}
|
|
}
|
|
// 扫码收付款
|
|
// 扫码收付款
|
|
- if (item === 2) {
|
|
|
|
|
|
+ if (item === 2) {
|
|
|
|
+ this.$refs.popup1.open();
|
|
clearInterval(this.setTimeOutPay);
|
|
clearInterval(this.setTimeOutPay);
|
|
this.ToChangeInto();
|
|
this.ToChangeInto();
|
|
return;
|
|
return;
|
|
@@ -431,6 +435,7 @@ export default {
|
|
success: function(res) {
|
|
success: function(res) {
|
|
let i = res.resultStr.split(",");
|
|
let i = res.resultStr.split(",");
|
|
obj.code = i[0];
|
|
obj.code = i[0];
|
|
|
|
+ obj.isSkm = /^\d+$/.test(obj.code);
|
|
obj.payTypeShow = i[1]*1
|
|
obj.payTypeShow = i[1]*1
|
|
|
|
|
|
obj.$refs.popup1.open();
|
|
obj.$refs.popup1.open();
|
|
@@ -443,6 +448,8 @@ export default {
|
|
success: function(e) {
|
|
success: function(e) {
|
|
let i = e.result.split(",");
|
|
let i = e.result.split(",");
|
|
obj.code = i[0];
|
|
obj.code = i[0];
|
|
|
|
+ obj.code = i[0];
|
|
|
|
+ obj.isSkm = /^\d+$/.test(obj.code);
|
|
obj.payTypeShow = i[1]*1
|
|
obj.payTypeShow = i[1]*1
|
|
obj.$refs.popup1.open();
|
|
obj.$refs.popup1.open();
|
|
}
|
|
}
|
|
@@ -513,6 +520,9 @@ export default {
|
|
this.$refs.popupPay.close()
|
|
this.$refs.popupPay.close()
|
|
console.log(this.payType)
|
|
console.log(this.payType)
|
|
this.clickItem(0)
|
|
this.clickItem(0)
|
|
|
|
+ },
|
|
|
|
+ changeShowPayType(e) {
|
|
|
|
+ this.payTypeShow = e
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
};
|