From bdc144e95fe4e6213c799f32e2e50c1d69d7e904 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Mon, 18 Oct 2021 13:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B7=B2=E4=BB=98=E5=AE=9A?=
 =?UTF-8?q?=E9=87=91/=E8=AE=A2=E9=87=91=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/IndustryOrderController.php   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/AdminAgent/Controllers/IndustryOrderController.php b/app/AdminAgent/Controllers/IndustryOrderController.php
index 0eab28c..656a89e 100644
--- a/app/AdminAgent/Controllers/IndustryOrderController.php
+++ b/app/AdminAgent/Controllers/IndustryOrderController.php
@@ -41,7 +41,7 @@ class IndustryOrderController extends AdminController
             $grid->column('price');
             $grid->column('name', '预留姓名');
             $grid->column('mobile', '预留手机');
-            $grid->column('title');
+            $grid->column('title')->limit(15);
             $grid->column('picture')->image('', 80, 80);
 			$grid->column('status')
 				->using(OrderStatus::array())
@@ -137,23 +137,31 @@ class IndustryOrderController extends AdminController
 					}
 					Admin::script("Dcat.swal.info('支付：$msg', null);");
 				} else {
+					$status_text = $show->model()->status == OrderStatus::PAY_EARNEST ?
+						'\'当前状态：<b style="color:red;">'.OrderStatus::array()[$show->model()->status].'</b>\''
+						: 'null';
+					$back_url = admin_url('industry_order/list');
 					Admin::js('@qrcode');
 					Admin::script(<<<JS
-Dcat.swal.info(null, null, {
+Dcat.swal.info('<div id="qrcode" style="margin-top:1rem;"></div>', $status_text, {
 	type: null,
-	html: '<div id="qrcode" style="margin-top:1rem;"></div>',
 	imageWidth: 240,
 	imageHeight: 240,
 	animation: false,
-	confirmButtonText: '我已支付，刷新页面',
+	confirmButtonText: '已支付，刷新',
+	showCancelButton: true,
+	cancelButtonText: '返回列表',
 	allowOutsideClick: false,
 	allowEscapeKey: false,
 	onOpen: function () {
 	    $('#qrcode').qrcode({text:'{$pay_config['code_url']}', width:240, height:240});
-	},
-	onClose: function() {
-		window.location.reload();
 	}
+}).then((res) => {
+    if (res.dismiss === 'cancel') {
+        window.location.href = '$back_url';
+    } else {
+        window.location.reload();
+    }
 });
 JS
 					);