From b71f6d55703018a4fe4806662e057d35b9c3cc70 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 28 May 2023 21:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/order/master.html | 4 ++- .../resources/templates/order/pay-qrcode.html | 27 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 363ca361..b5367028 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -466,7 +466,9 @@ actions.push('查看 '); actions.push('师傅退单 '); actions.push('商家退单 '); - actions.push('付款 '); + if (row.payStatus == 0) { + actions.push('付款 '); + } return actions.join(''); } }, diff --git a/ghy-admin/src/main/resources/templates/order/pay-qrcode.html b/ghy-admin/src/main/resources/templates/order/pay-qrcode.html index 597e600c..6a4189e8 100644 --- a/ghy-admin/src/main/resources/templates/order/pay-qrcode.html +++ b/ghy-admin/src/main/resources/templates/order/pay-qrcode.html @@ -3,19 +3,38 @@ +
- + +