From dd9f393aeeaf8ed8695ce8e407bcdd308e4ed712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
<93301500+xushubieli@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BC=98=E5=8C=96=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/templets/index.htm | 2 +-
src/admin/templets/member_operations.htm | 40 +++++++++++-----------
src/admin/templets/member_rank.htm | 15 +++-----
src/admin/templets/member_scores.htm | 34 +++++++++---------
src/admin/templets/plus_main.htm | 2 +-
src/admin/templets/sys_admin_user_add.htm | 4 +--
src/admin/templets/sys_admin_user_edit.htm | 4 +--
src/admin/templets/sys_cache_up.htm | 2 +-
src/apps/notify.php | 7 ++--
src/apps/return.php | 7 ++--
src/user/buy_action.php | 7 ++--
11 files changed, 57 insertions(+), 67 deletions(-)
diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index 122fea51..167e8fc7 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -51,7 +51,7 @@
diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm
index 25de61cf..e42c2d7b 100644
--- a/src/admin/templets/member_operations.htm
+++ b/src/admin/templets/member_operations.htm
@@ -31,7 +31,7 @@
function DelSel() {
var nid = getCheckboxItem();
if (nid == "") {
- alert("请选择要删除的业务记录");
+ alert("请选择要删除消费记录");
return;
}
location.href = "member_do.php?dopost=deoperations&nid=" + nid;
@@ -39,7 +39,7 @@
function UpSel() {
var nid = getCheckboxItem();
if (nid == "") {
- alert("请选择要修改的业务记录");
+ alert("请选择要修改消费记录");
return;
}
location.href = "member_do.php?dopost=upoperations&nid=" + nid;
@@ -47,7 +47,7 @@
function OkSel() {
var nid = getCheckboxItem();
if (nid == "") {
- alert("请选择要修改的业务记录");
+ alert("请选择要修改消费记录");
return;
}
location.href = "member_do.php?dopost=okoperations&nid=" + nid;
@@ -73,27 +73,27 @@
| 会员消费记录 |
-
- | 选择 |
- 订单号 |
- 产品名称 |
- 产品类型 |
- 生成日期 |
- 金额 |
- 状态 |
- 会员 |
+
+ | 选择 |
+ 订单号 |
+ 产品名称 |
+ 产品类型 |
+ 生成日期 |
+ 金额 |
+ 状态 |
+ 会员 |
diff --git a/src/admin/templets/member_rank.htm b/src/admin/templets/member_rank.htm
index 897e932f..81b6ee69 100644
--- a/src/admin/templets/member_rank.htm
+++ b/src/admin/templets/member_rank.htm
@@ -21,10 +21,10 @@
- | 级别名称 |
- 会员等级值 |
- 默认金币 |
- 默认积分 |
+ 级别名称 |
+ 会员等级值 |
+ 默认金币 |
+ 默认积分 |
类型 |
状态 |
@@ -42,12 +42,7 @@
|
|
|
-
- id<=5) { echo "系统"; }
- else { echo "用户"; }
- ?>
- |
+ id<=5) { echo "系统"; } else {echo "用户";}?> |
id == 3) echo 'disabled="disabled"';?> value="1" checked="checked"> 正在使用 |
diff --git a/src/admin/templets/member_scores.htm b/src/admin/templets/member_scores.htm
index 4a7aec62..b42bde89 100644
--- a/src/admin/templets/member_scores.htm
+++ b/src/admin/templets/member_scores.htm
@@ -28,21 +28,21 @@
| 积分头衔设置 |
-
- | 反选 |
- 积分大于 |
- 星星数 |
- 级别头衔 |
- 是否默认 |
+
+ | 反选 |
+ 积分大于 |
+ 星星数 |
+ 级别头衔 |
+ 是否默认 |
-
- |
- |
- |
-
+ |
+ |
+ |
+ |
+
|
-
+ |
|
-
+
| 新增： |
- |
- |
- |
-
+ | |
+ |
+ |
+
|
{/dede:datalist}
- | 上传模块插件 |
+ 上传模块插件 |
| {dede:pagelist listsize='6'/} |
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index eb15afdb..5f8f6aee 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -3,7 +3,7 @@
- 新增帐号
+ 添加管理员
@@ -37,7 +37,7 @@
diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm
index a383c27a..bedbd097 100644
--- a/src/admin/templets/sys_admin_user_edit.htm
+++ b/src/admin/templets/sys_admin_user_edit.htm
@@ -3,7 +3,7 @@
- 修改帐号
+ 修改管理员
@@ -14,7 +14,7 @@
|
diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm
index c87e50d9..a90f9ca3 100644
--- a/src/admin/templets/sys_cache_up.htm
+++ b/src/admin/templets/sys_cache_up.htm
@@ -17,7 +17,7 @@
|
|
- 默认执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信 6、删除过期流量统计
+ 默认执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信
|
diff --git a/src/apps/notify.php b/src/apps/notify.php
index f0c5716f..5fe874de 100644
--- a/src/apps/notify.php
+++ b/src/apps/notify.php
@@ -9,10 +9,8 @@
* @link https://www.dedebiz.com
*/
require_once(dirname(__FILE__)."/../system/common.inc.php");
-
$dopost = isset($dopost)? $dopost : '';
$buyid = isset($out_trade_no)? HtmlReplace($out_trade_no, 1) : '';
-
if ($dopost === 'alipay') {
$moRow = $dsql->GetOne("SELECT * FROM `#@__member_operation` WHERE buyid='$buyid'");
if (empty($moRow)) {
@@ -38,11 +36,9 @@ if ($dopost === 'alipay') {
unset($_REQUEST['dopost']);
unset($_REQUEST['sign_type']);
$data = $pay->notify(false, $_REQUEST);
-
if (isset($data['trade_no']) && !empty($data['trade_no'])) {
// $pay = \AliPay\Transfer::instance($config);
$result = $pay->query($data['out_trade_no']);
-
if ($result['trade_status']=== "TRADE_SUCCESS") {
$row = $dsql->GetOne("SELECT * FROM `#@__moneycard_type` WHERE tid='{$moRow['pid']}'");
$query = "UPDATE `#@__member_operation` SET sta = '2' WHERE buyid = '$buyid'";
@@ -91,4 +87,5 @@ if ($dopost === 'alipay') {
} else {
ShowMsg("未知支付方式", "javascript:;");
exit;
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/src/apps/return.php b/src/apps/return.php
index de521df0..46fb0f12 100644
--- a/src/apps/return.php
+++ b/src/apps/return.php
@@ -9,10 +9,8 @@
* @link https://www.dedebiz.com
*/
require_once(dirname(__FILE__)."/../system/common.inc.php");
-
$dopost = isset($dopost)? $dopost : '';
$buyid = isset($out_trade_no)? HtmlReplace($out_trade_no, 1) : '';
-
if ($dopost === 'alipay') {
$moRow = $dsql->GetOne("SELECT * FROM `#@__member_operation` WHERE buyid='$buyid'");
if (empty($moRow)) {
@@ -38,11 +36,9 @@ if ($dopost === 'alipay') {
unset($_REQUEST['dopost']);
unset($_REQUEST['sign_type']);
$data = $pay->notify();
-
if (isset($data['trade_no']) && !empty($data['trade_no'])) {
// $pay = \AliPay\Transfer::instance($config);
$result = $pay->query($data['out_trade_no']);
-
if ($result['trade_status']=== "TRADE_SUCCESS") {
$row = $dsql->GetOne("SELECT * FROM `#@__moneycard_type` WHERE tid='{$moRow['pid']}'");
$query = "UPDATE `#@__member_operation` SET sta = '2' WHERE buyid = '$buyid'";
@@ -60,4 +56,5 @@ if ($dopost === 'alipay') {
ShowMsg("付款错误", "javascript:;");
exit;
}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/src/user/buy_action.php b/src/user/buy_action.php
index 344056b7..9e71689b 100755
--- a/src/user/buy_action.php
+++ b/src/user/buy_action.php
@@ -170,7 +170,7 @@ if ($paytype === 0) {
'notify_url' => $GLOBALS['cfg_basehost'].$GLOBALS['cfg_phpurl'].'/notify.php?dopost=wechat',
);
try {
- // 生成预支付码
+ //生成预支付码
$result = $wechat->createOrder($options);
$payurl = $result['code_url'];
$msg = "请使用微信扫一扫，扫描二维码支付：
已完成支付 返回订单管理";
@@ -201,10 +201,10 @@ if ($paytype === 0) {
"notify_url" => $GLOBALS['cfg_basehost'].$GLOBALS['cfg_phpurl'].'/notify.php?dopost=alipay',
"return_url" => $GLOBALS['cfg_basehost'].$GLOBALS['cfg_phpurl'].'/return.php?dopost=alipay',
);
- // var_dump($config);exit;
+ //var_dump($config);exit;
//支付宝
try {
- // 实例支付对象
+ //实例支付对象
$pay = \AliPay\Web::instance($config);
$result = $pay->apply(array(
'out_trade_no' => $buyid, // 商户订单号
@@ -282,3 +282,4 @@ function mchStrCode($string, $operation = 'ENCODE')
}
}
}
+?>
\ No newline at end of file
getUserName();?>getUserType()==10){echo "管理员";} else if ($cuserLogin->getUserType()==5) {echo "栏目员";} else {echo "文档员";}?>