Commit f5e9c3a0 authored by 郭志伟's avatar 郭志伟

Merge branch 'fix/goods' into 'master'

fix: 移除阻断

See merge request !77
parents 0dc0676d e5f78cba
...@@ -228,13 +228,13 @@ export default { ...@@ -228,13 +228,13 @@ export default {
this.popupShow = true; this.popupShow = true;
}, },
onSubmit() { onSubmit() {
const { payPeriod, payType, policyPeriod, birth } = this.formData; // const { payPeriod, payType, policyPeriod, birth } = this.formData;
if (!payPeriod || !payType || !policyPeriod || !birth) { // if (!payPeriod || !payType || !policyPeriod || !birth) {
this.$notify({ type: "warning", message: "请选择保费方案" }); // this.$notify({ type: "warning", message: "请选择保费方案" });
this.popupShow = true; // this.popupShow = true;
this.currentPupopIndex = 6; // this.currentPupopIndex = 6;
return; // return;
} // }
this.showLoginPopup(); this.showLoginPopup();
this.popupShow = false; this.popupShow = false;
}, },
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
}, },
getPayResult() { getPayResult() {
const { payOrderNo, orderNo } = this.orderInfo; const { payOrderNo, orderNo } = this.orderInfo;
placeOrder.polling({ payOrderNo, payOrderType: 1 }).then(payRes => { placeOrder.polling({ payOrderNo, payOrderType: 1 }).then(payRes => {
if (!payRes.result && payRes.payState === 2) { if (!payRes.result && payRes.payState === 2) {
this.payTimer = setTimeout(() => { this.payTimer = setTimeout(() => {
this.getPayResult(); this.getPayResult();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment