xinyin025/mpay
1
0
Fork 0
mirror of https://gitee.com/technical-laohu/mpay.git synced 2025-09-25 05:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: xinyin025:ee49c2a0d04f8b2154fbe0b6b326ed6c0500a7d8
Branches Tags
xinyin025:setconfig
xinyin025:master
xinyin025:v1.2.4
xinyin025:v1.2.3
xinyin025:v1.2.2
xinyin025:v1.2.1
xinyin025:v1.2.0
xinyin025:1.2.0
xinyin025:v1.1.5
xinyin025:v1.1.4
xinyin025:v1.1.3
xinyin025:v1.1.2
xinyin025:v1.1.1
xinyin025:v1.1.0
xinyin025:v1.0.3
xinyin025:v1.0.2
xinyin025:v1.0.1
xinyin025:v1.0.0
..
compare: xinyin025:fa75d580b8b72fb82b41ddce9fd30b1a72d3763a
Branches Tags
xinyin025:setconfig
xinyin025:master
xinyin025:v1.2.4
xinyin025:v1.2.3
xinyin025:v1.2.2
xinyin025:v1.2.1
xinyin025:v1.2.0
xinyin025:1.2.0
xinyin025:v1.1.5
xinyin025:v1.1.4
xinyin025:v1.1.3
xinyin025:v1.1.2
xinyin025:v1.1.1
xinyin025:v1.1.0
xinyin025:v1.0.3
xinyin025:v1.0.2
xinyin025:v1.0.1
xinyin025:v1.0.0

No commits in common. "ee49c2a0d04f8b2154fbe0b6b326ed6c0500a7d8" and "fa75d580b8b72fb82b41ddce9fd30b1a72d3763a" have entirely different histories.
ee49c2a0d0 ... fa75d580b8

4 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
app/controller/InstallController.php
View File

@ -227,8 +227,8 @@ EOT;
`order_id` varchar(255) NOT NULL DEFAULT '',
`type` varchar(255) NOT NULL DEFAULT '',
`out_trade_no` varchar(255) NOT NULL DEFAULT '',
`notify_url` varchar(512) NOT NULL DEFAULT '',
`return_url` varchar(512) NOT NULL DEFAULT '',
`notify_url` varchar(255) NOT NULL DEFAULT '',
`return_url` varchar(255) NOT NULL DEFAULT '',
`name` varchar(255) NOT NULL DEFAULT '',
`really_price` decimal(10, 2) NOT NULL DEFAULT 0.00,
`money` decimal(10, 2) NOT NULL DEFAULT 0.00,
@ -264,7 +264,7 @@ EOT;
`account_id` int(11) NOT NULL DEFAULT 0,
`channel` varchar(255) NOT NULL DEFAULT '',
`type` tinyint(4) NOT NULL DEFAULT 0,
`qrcode` varchar(512) NOT NULL DEFAULT '',
`qrcode` varchar(255) NOT NULL DEFAULT '',
`last_time` datetime DEFAULT CURRENT_TIMESTAMP,
`state` tinyint(4) NOT NULL DEFAULT 1,
`delete_time` datetime DEFAULT NULL,

1
app/controller/PayController.php
View File

@ -165,7 +165,6 @@ class PayController
foreach ($activeOrders as $order) {
// 支付方式核对
$is_payway = $order->type == $new_order['payway'];
if ($new_order['payway'] == '') $is_payway = true;
// 支付渠道核对
$is_channel = $cids[$order->cid] == $new_order['channel'];
// 金额核对

2
view/index/doc.html
View File

@ -8,6 +8,8 @@
<head>
<title>开发文档</title>
</head>
<link rel="stylesheet" type="text/css"
href="https://cdn.jsdelivr.net/gh/pandao/editor.md@1.5.0/css/editormd.min.css">
<style type="text/css">
body {
font-family: "Helvetica Neue", "Helvetica", "Microsoft Yahei", "微软雅黑", "Lantinghei SC", "STXihei", "WenQuanYi Micro Hei", Arial, sans-serif;

5
view/pay/console.html
View File

@ -305,10 +305,9 @@
openAppBtn.className = 'layui-btn layui-btn-normal';
openAppBtn.onclick = function () {
if (codeType == 0) {
const payUrl = encodeURIComponent(payCode);
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + payUrl;
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + payCode;
} else {
const currentUrl = encodeURIComponent(window.location.href);
const currentUrl = window.location.href;
window.location.href = 'alipays://platformapi/startapp?appId=20000067&&url=' + currentUrl;
}
};