parent
ab1f5bd199
commit
5ea24d76c8
|
|
@ -141,7 +141,8 @@ export default {
|
|||
this.$nextTick(() => {
|
||||
QRCode.toCanvas(
|
||||
this.$refs.canvas,
|
||||
this.paymentQrcode,
|
||||
this.paymentQrcode,{width: 160,
|
||||
height: 160,},
|
||||
function (error) {
|
||||
console.log(error);
|
||||
}
|
||||
|
|
@ -192,11 +193,11 @@ export default {
|
|||
this.close();
|
||||
this.$emit("confirm", this.form.code);
|
||||
},
|
||||
open() {
|
||||
open(data) {
|
||||
this.show = true;
|
||||
this.form.money = Number(this.price).toFixed(2);
|
||||
if (this.openSwitch) {
|
||||
$getOrderPayUrl({ orderId: this.order.id,payAmount:this.price.toFixed(2) }).then((res) => {
|
||||
$getOrderPayUrl({ orderId: this.order.id||data.id,payAmount:this.form.money||data.settlementAmount }).then((res) => {
|
||||
console.log(res);
|
||||
this.paymentQrcode = res;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1166,7 +1166,7 @@
|
|||
|
||||
<return-cart
|
||||
ref="refReturnCart"
|
||||
:max="order.selGoods.number"
|
||||
:max="order.selGoods?order.selGoods.number:1"
|
||||
@confirm="refReturnCartConfirm"
|
||||
></return-cart>
|
||||
</div>
|
||||
|
|
@ -1856,9 +1856,10 @@ export default {
|
|||
return;
|
||||
}
|
||||
await this.returnCreateOrderData();
|
||||
this.payBeforeClear();
|
||||
console.log( this.createOrder.data )
|
||||
this.order.payType = "scanCode";
|
||||
this.payTypeItemClick({ payType: "scanCode" });
|
||||
this.payBeforeClear();
|
||||
},
|
||||
async changeOrderUseType(useType) {
|
||||
if (useType && this.order.list.length) {
|
||||
|
|
@ -2047,7 +2048,7 @@ export default {
|
|||
}
|
||||
if (item.payType == "scanCode") {
|
||||
//扫码支付
|
||||
return this.refToggle("refWxScanCode", true);
|
||||
return this.refToggle("refWxScanCode", true,this.createOrder.data);
|
||||
}
|
||||
},
|
||||
ChangeDiscount(discount) {
|
||||
|
|
@ -2181,7 +2182,7 @@ export default {
|
|||
return this.refChooseUserOpen();
|
||||
}
|
||||
if (this.order.payType == "scanCode") {
|
||||
return this.refToggle("refWxScanCode", true);
|
||||
return this.refToggle("refWxScanCode", true,this.createOrder.data);
|
||||
}
|
||||
if (this.order.payType == "deposit") {
|
||||
return this.refToggle("refScanCode", true);
|
||||
|
|
|
|||
Loading…
Reference in New Issue