clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
kuang.yife 2023-05-28 22:16:02 +08:00
parent 9f6a22a065 7d22d8bd86
commit a3168fdb6d
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ghy-admin/src/main/resources/templates/order/master.html
View File

@ -541,8 +541,24 @@
}
function showPayQrcode(id) {
var url = "order/detail/payQrcode/" + id;
$.modal.open("支付二维码", url, 290, 360);
var url = "detail/payQrcode/" + id;
<!-- $.modal.open("支付二维码", url, 290, 360);-->
layer.open({
type: 2,
area: ['290px', '360px'],
fix: false,
//不固定
maxmin: true,
shade: 0.3,
title: '支付二维码',
content: url,
btn: ['关闭'],
// 弹层外区域关闭
shadeClose: true,
cancel: function(index) {
return true;
}
});
}
</script>

3
ghy-admin/src/main/resources/templates/order/pay-qrcode.html
View File

@ -12,9 +12,8 @@
<body class="gray-bg">
<div id="payQrcode"></div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/js/jquery.qrcode.min.js}"></script>
<script th:inline="javascript">
var orderDetailId = '[[${orderId}]]';