From ab1f5bd199fe8e1a427b368f0142e3ad8a75d6e7 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 23 Oct 2024 13:53:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=80=E8=8F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order_manage/components/orderDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue index c8007f7..9c8f890 100644 --- a/src/views/order_manage/components/orderDetail.vue +++ b/src/views/order_manage/components/orderDetail.vue @@ -132,7 +132,9 @@ From 5ea24d76c899f7440679f5315a46f0f16e286084 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 23 Oct 2024 16:32:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E4=BB=A3?= =?UTF-8?q?=E5=AE=A2=E4=B8=8B=E5=8D=95=E5=85=88=E4=BB=98=E8=B4=B9=E4=B8=8B?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=82=B9=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98=E9=93=BE=E6=8E=A5=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=202.=E4=BF=AE=E5=A4=8D=E6=B8=85=E7=A9=BA=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E5=88=A0=E9=99=A4=E5=9B=A0=E4=B8=BA=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=AF=BC=E8=87=B4=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E4=BA=8B=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/components/scan-pay.vue | 7 ++++--- src/views/tool/Instead/index.vue | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue index 60830a0..fd68e0e 100644 --- a/src/views/tool/Instead/components/scan-pay.vue +++ b/src/views/tool/Instead/components/scan-pay.vue @@ -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; }); diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index 8a9aa4a..0a756d6 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -1166,7 +1166,7 @@ @@ -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); From 3fb8a7b748db18f74d55b488e35a42ff584c4b84 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 23 Oct 2024 16:38:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order_manage/components/orderDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue index 9c8f890..6e3a19e 100644 --- a/src/views/order_manage/components/orderDetail.vue +++ b/src/views/order_manage/components/orderDetail.vue @@ -130,14 +130,14 @@ ￥{{ scope.row.priceAmount }} - +