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 ?
+ '\'当前状态:'.OrderStatus::array()[$show->model()->status].'\''
+ : 'null';
+ $back_url = admin_url('industry_order/list');
Admin::js('@qrcode');
Admin::script(<<', $status_text, {
type: null,
- html: '',
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
);