diff --git a/src/admin/member_do.php b/src/admin/member_do.php index b988afd7..0d4f7e34 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -145,11 +145,15 @@ function __EditUser() else if ($dopost == 'edituser') { CheckPurview('member_Edit'); $send_max = isset($send_max)? intval($send_max) : 0; - $user_money = isset($user_money)? intval($user_money) : 0; + $user_money = isset($user_money)? floatval($user_money) : 0.0; $money = isset($money)? intval($money) : 0; $scores = isset($scores)? intval($scores) : 0; $rank = isset($rank)? intval($rank) : 0; $id = isset($id)? intval($id) : 0; + $email = isset($email)? HtmlReplace($email,1) : ''; + $uname = isset($uname)? HtmlReplace($uname,1) : ''; + $spacesta = isset($spacesta)? HtmlReplace($spacesta,1) : ''; + $exptime = isset($exptime)? HtmlReplace($exptime,1) : ''; if (!isset($_POST['id'])) exit('dedebiz'); $pwdsql = empty($pwd) ? '' : ",pwd='".md5($pwd)."'"; if (function_exists('password_hash')) { @@ -164,7 +168,7 @@ else if ($dopost == 'edituser') { $query = "UPDATE `#@__member` SET send_max='$send_max',email='$email',uname='$uname',sex='$sex',matt='$matt',user_money='$user_money',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' AND matt<>10 "; $rs = $dsql->ExecuteNoneQuery2($query); if ($rs == 0) { - $query = "UPDATE `#@__member` SET email='$email',uname='$uname',sex='$sex',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' "; + $query = "UPDATE `#@__member` SET email='$email',uname='$uname',sex='$sex',user_money='$user_money',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' "; $rs = $dsql->ExecuteNoneQuery2($query); } ShowMsg('成功修改会员资料', 'member_view.php?id='.$id); diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index 60ad7ea9..f2ad045a 100644 --- a/src/admin/templets/sys_payment.htm +++ b/src/admin/templets/sys_payment.htm @@ -9,6 +9,7 @@ + @@ -261,7 +262,11 @@ contentType: "application/json; charset=utf-8", dataType: "json", success: function (data) { - console.log(data); + if (data.code === 0) { + ShowMsg("保存支付配置成功"); + } else { + ShowMsg("保存失败"); + } } }) } @@ -270,7 +275,6 @@ $("#btnSave").click(() => { updateConfig() saveConfig(); - console.log(config) }) }) diff --git a/src/admin/templets/sys_payment_install.htm b/src/admin/templets/sys_payment_install.htm deleted file mode 100644 index fb67aa49..00000000 --- a/src/admin/templets/sys_payment_install.htm +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - 安装支付接口 - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
支付接口设置 > 安装支付接口
支付名称：
支付描述：
手续费： 元
货到付款：
在线支付：
- - \ No newline at end of file diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index a3e92b6b..45b3e703 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -4086,6 +4086,13 @@ INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文 (4, 'acb8b88eb4a6d4bfc375c18534f9439e', '投票模块', '', '', 0, ''), (5, '572606600345b1a4bb8c810bbae434cc', '挑错管理', '', '', 0, ''); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (1, 'Wechat', '微信支付', '微信', 0, '{"AppID":"","MchID":"","APIv2Secret":""}', 0); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (2, 'Alipay', '支付宝支付', '支付宝', 1, '{"APPID":"","PrivateKey":"","CertPublicKey":"","RootCert":"AlipayRootCert","SignType":"RSA2"}', 0); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (3, 'Bank', '银行转账', '转账', 2, '{"AccountName":"泰隆商业银行上海杨浦支行","AccountNO":"31010090201000020658","Name":"上海穆云智能科技有限公司"}', 1); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (4, 'Balance', '余额支付', '余额', 3, '{}', 1); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (5, 'Cod', '货到付款', '货到付款', 4, '{}', 0); + + INSERT INTO `#@__plus` VALUES(1, '文件管理器', '', '', 'DedeBIZ', 1, ''), (2, '友情链接模块', '', '', 'DedeBIZ', 1, ''), (3, '广告管理', '', '', 'DedeBIZ', 1, ''), diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt index 9620168c..523d1d98 100755 --- a/src/install/sql-dftables.txt +++ b/src/install/sql-dftables.txt @@ -491,6 +491,7 @@ CREATE TABLE `#@__member` ( `checkmail` smallint(6) NOT NULL default '-1', `loginerr` tinyint NULL DEFAULT 0, `send_max` int DEFAULT '0', + `user_money` decimal(10, 2) unsigned NULL default 0.00, PRIMARY KEY (`mid`), KEY `userid` (`userid`,`sex`), KEY `logintime` (`logintime`) diff --git a/src/install/update.txt b/src/install/update.txt index e889bb0a..06638b27 100644 --- a/src/install/update.txt +++ b/src/install/update.txt @@ -120,9 +120,11 @@ CREATE TABLE `#@__sys_payment` ( `status` int(3) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) TYPE=MyISAM; -INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (1, 'Wechat', '微信支付', '微信', 0, '{"AppID":"","AppSecret":"","MchID":"","APIV3Key":"","SerialNo":"","PrivateKey":"WechatPrivateKey"}', 0); -INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (2, 'Alipay', '支付宝支付', '支付宝', 1, '{"APPID":"","PrivateKey":"","AppCertPublicKey":"AlipayAppCertPublicKey","CertPublicKey":"AlipayCertPublicKey","RootCert":"AlipayRootCert","SignType":"RSA2"}', 0); -INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (3, 'Bank', '银行转账', '转账', 2, '{"AccountName":"","AccountNO":"","Name":""}', 0); -INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (4, 'Balance', '余额支付', '余额', 3, '[]', 0); -INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (5, 'Cod', '货到付款', '货到付款', 4, '[]', 0); + +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (1, 'Wechat', '微信支付', '微信', 0, '{"AppID":"","MchID":"","APIv2Secret":""}', 0); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (2, 'Alipay', '支付宝支付', '支付宝', 1, '{"APPID":"","PrivateKey":"","CertPublicKey":"","RootCert":"AlipayRootCert","SignType":"RSA2"}', 0); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (3, 'Bank', '银行转账', '转账', 2, '{"AccountName":"泰隆商业银行上海杨浦支行","AccountNO":"31010090201000020658","Name":"上海穆云智能科技有限公司"}', 1); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (4, 'Balance', '余额支付', '余额', 3, '{}', 1); +INSERT INTO `#@__sys_payment`(`id`, `code`, `name`, `short_name`, `sortrank`, `config`, `status`) VALUES (5, 'Cod', '货到付款', '货到付款', 4, '{}', 0); + ALTER TABLE `#@__member` ADD COLUMN `user_money` decimal(10, 2) UNSIGNED NULL DEFAULT 0.00 AFTER `send_max`; \ No newline at end of file