|
@@ -22,8 +22,8 @@
|
|
<div v-if="formType == 1 && formData.flag == 'WAIT'" slot="footer" class="dialog-footer">
|
|
<div v-if="formType == 1 && formData.flag == 'WAIT'" slot="footer" class="dialog-footer">
|
|
<el-button size="mini" type="primary" @click="shenhexinxi">审核</el-button>
|
|
<el-button size="mini" type="primary" @click="shenhexinxi">审核</el-button>
|
|
</div>
|
|
</div>
|
|
- <div v-if="formType == 0 && formData.payStatus == 'WAIT' && formData.payType == 1" slot="footer"
|
|
|
|
- class="dialog-footer">
|
|
|
|
|
|
+ <div v-if="formType == 0 && formData.flag == 'OK' && formData.payStatus == 'WAIT' && formData.payType == 1"
|
|
|
|
+ slot="footer" class="dialog-footer">
|
|
<el-button size="mini" type="primary" @click="() => { wxPay(formData.id) }">扫码支付</el-button>
|
|
<el-button size="mini" type="primary" @click="() => { wxPay(formData.id) }">扫码支付</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -365,11 +365,12 @@ export default {
|
|
"machineImg": this.addFormData.machineImg.map(item => item.url).join(","),
|
|
"machineImg": this.addFormData.machineImg.map(item => item.url).join(","),
|
|
}).then(res => {
|
|
}).then(res => {
|
|
this.$message({ type: 'success', message: `新增成功!` })
|
|
this.$message({ type: 'success', message: `新增成功!` })
|
|
- if (res.data.payStatus == "WAIT" && res.data.payType == 1) {
|
|
|
|
- this.wxPay(res.data.id)
|
|
|
|
- } else {
|
|
|
|
- this.addFormCancel()
|
|
|
|
- }
|
|
|
|
|
|
+ this.addFormCancel()
|
|
|
|
+ // if (res.data.payStatus == "WAIT" && res.data.payType == 1) {
|
|
|
|
+ // this.wxPay(res.data.id)
|
|
|
|
+ // } else {
|
|
|
|
+ // this.addFormCancel()
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
}
|
|
}
|
|
})
|
|
})
|