DedeBIZ
/
DedeV6
Tarkkaile 2
Äänestä 0
Fork 0
Koodi Pull-pyynnöt 0 Julkaisut 31 Activity
Selaa lähdekoodia

同步优化调整

tags/6.2.5
叙述、别离 2 vuotta sitten
vanhempi
b13b93a29f
commit
dd9f393aee
11 muutettua tiedostoa jossa 57 lisäystä ja 67 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/admin/templets/index.htm
  2. +20
    -20
      src/admin/templets/member_operations.htm
  3. +5
    -10
      src/admin/templets/member_rank.htm
  4. +17
    -17
      src/admin/templets/member_scores.htm
  5. +1
    -1
      src/admin/templets/plus_main.htm
  6. +2
    -2
      src/admin/templets/sys_admin_user_add.htm
  7. +2
    -2
      src/admin/templets/sys_admin_user_edit.htm
  8. +1
    -1
      src/admin/templets/sys_cache_up.htm
  9. +2
    -5
      src/apps/notify.php
  10. +2
    -5
      src/apps/return.php
  11. +4
    -3
      src/user/buy_action.php

+ 1
- 1
src/admin/templets/index.htm Näytä tiedosto

@@ -51,7 +51,7 @@
</div>
<div class="top-admin">
<ul class="mb-0">
<li><a href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID();?>&dopost=edit" target="main"><?php echo $cuserLogin->getUserName();?><?php if ($cuserLogin->getUserType()==10){echo "管理员";} else if ($cuserLogin->getUserType()==5) {echo "栏目员";} else {echo "文档员";}?></a></li>
<li><a href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID();?>&dopost=edit" target="main"><img src="../static/web/img/admin.png"><?php echo $cuserLogin->getUserName();?><?php if ($cuserLogin->getUserType()==10){echo "管理员";} else if ($cuserLogin->getUserType()==5) {echo "栏目员";} else {echo "文档员";}?></a></li>
<li><a href="exit.php">退了</a></li>
</ul>
</div>


+ 20
- 20
src/admin/templets/member_operations.htm Näytä tiedosto

@@ -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 @@
<tr>
<td bgcolor="#f5f5f5" colspan="8">会员消费记录</td>
</tr>
<tr bgcolor="#e9ecef">
<td width="6%" align="center">选择</td>
<td width="20%" align="center">订单号</td>
<td align="center">产品名称</td>
<td width="10%" align="center">产品类型</td>
<td width="22%" align="center">生成日期</td>
<td width="6%" align="center">金额</td>
<td width="6%" align="center">状态</td>
<td align="center">会员</td>
<tr bgcolor="#e9ecef" align="center">
<td width="6%">选择</td>
<td width="16%">订单号</td>
<td>产品名称</td>
<td width="10%">产品类型</td>
<td width="16%">生成日期</td>
<td width="6%">金额</td>
<td width="6%">状态</td>
<td width="10%">会员</td>
</tr>
<form name="form1">
{dede:datalist empty='<tr><td colspan="8" align="center">暂无文档</td></tr>'}
<tr align="center">
<td align="center"><input type="checkbox" name="aids" value="<?php echo $fields['aid']?>"></td>
<td align="center"><?php echo $fields['buyid']?></td>
<td align="center"><?php echo $fields['pname'].'('.$fields['oldinfo'].')';?></td>
<td align="center"><?php echo GetPType($fields['product'])?></td>
<td align="center"><?php echo GetDateTimeMk($fields['mtime'])?>（{dede:field.mtime function="floorTime(time()-@me,@me)"/}）</td>
<td align="center"><?php echo $fields['money']?></td>
<td align="center"><?php echo GetSta($fields['sta'])?></td>
<td align="center"><?php echo GetMemberID($fields['mid'])?></td>
<td><input type="checkbox" name="aids" value="<?php echo $fields['aid']?>"></td>
<td><?php echo $fields['buyid']?></td>
<td><?php echo $fields['pname'].'（'.$fields['oldinfo'].'）';?></td>
<td><?php echo GetPType($fields['product'])?></td>
<td><?php echo GetDateTimeMk($fields['mtime'])?>（{dede:field.mtime function="floorTime(time()-@me,@me)"/}）</td>
<td><?php echo $fields['money']?></td>
<td><?php echo GetSta($fields['sta'])?></td>
<td><?php echo GetMemberID($fields['mid'])?></td>
</tr>
{/dede:datalist}
</form>


+ 5
- 10
src/admin/templets/member_rank.htm Näytä tiedosto

@@ -21,10 +21,10 @@
</td>
</tr>
<tr align="center">
<td width="20%">级别名称</td>
<td width="18%">会员等级值</td>
<td width="15%">默认金币</td>
<td width="15%">默认积分</td>
<td width="16%">级别名称</td>
<td width="16%">会员等级值</td>
<td width="16%">默认金币</td>
<td width="16%">默认积分</td>
<td width="16%">类型</td>
<td width="16%">状态</td>
</tr>
@@ -42,12 +42,7 @@
<td><input type="text" name="rank_<?php echo $k?>" value="<?php echo $row->rank;?>" id="rank_<?php echo $k?>"></td>
<td><input type="text" name="money_<?php echo $k?>" value="<?php echo $row->money;?>" id="money_<?php echo $k?>"></td>
<td><input type="text" name="scores_<?php echo $k?>" value="<?php echo $row->scores;?>" id="scores_<?php echo $k?>"></td>
<td align="center">
<?php
if ($row->id<=5) { echo "系统"; }
else { echo "用户"; }
?>
</td>
<td><?php if ($row->id<=5) { echo "系统"; } else {echo "用户";}?></td>
<td><input type="checkbox" name="check_<?php echo $k?>" id="check_<?php echo $k?>" <?php if ($row->id == 3) echo 'disabled="disabled"';?> value="1" checked="checked"> 正在使用</td>
</tr>
<?php }?>


+ 17
- 17
src/admin/templets/member_scores.htm Näytä tiedosto

@@ -28,21 +28,21 @@
<tr>
<td colspan="5" bgcolor="#f5f5f5">积分头衔设置</td>
</tr>
<tr bgcolor="#e9ecef">
<td width="6%" align="center"><input type="checkbox" name="chkall" id="chkall" onclick="CheckAll(this.form)"> 反选</td>
<td width="23%" align="center">积分大于</td>
<td width="30%" align="center">星星数</td>
<td width="23%" align="center">级别头衔</td>
<td width="30%" align="center">是否默认</td>
<tr bgcolor="#e9ecef" align="center">
<td width="6%"><input type="checkbox" name="chkall" id="chkall" onclick="CheckAll(this.form)"> 反选</td>
<td width="26%">积分大于</td>
<td width="26%">星星数</td>
<td width="26%">级别头衔</td>
<td>是否默认</td>
</tr>
<?php foreach($Scores as $v) {?>
<tr>
<td align="center"><input type="checkbox" name="Ids-<?php echo $v['id']?>" id="Ids-<?php echo $v['id']?>" value="1"></td>
<td align="center"><input type="text" name="integral-<?php echo $v['id']?>" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" class="admin-input-sm"></td>
<td align="center"><input type="text" name="icon-<?php echo $v['id']?>" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" class="admin-input-sm"></td>
<td align="center"><input type="text" name="titles-<?php echo $v['id']?>" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" class="admin-input-sm">
<tr align="center">
<td><input type="checkbox" name="Ids-<?php echo $v['id']?>" id="Ids-<?php echo $v['id']?>" value="1"></td>
<td><input type="text" name="integral-<?php echo $v['id']?>" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" class="admin-input-sm"></td>
<td><input type="text" name="icon-<?php echo $v['id']?>" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" class="admin-input-sm"></td>
<td><input type="text" name="titles-<?php echo $v['id']?>" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" class="admin-input-sm">
</td>
<td align="center">
<td>
<select name="isdefault-<?php echo $v['id']?>" id="isdefault-<?php echo $v['id']?>">
<option value="1" <?php if ($v['isdefault']) echo " selected='selected'";?>>是</option>
<option value="0" <?php if (!$v['isdefault']) echo " selected='selected'";?>>否</option>
@@ -50,12 +50,12 @@
</td>
</tr>
<?php }?>
<tr>
<tr align="center">
<td>新增：</td>
<td align="center"><input type="text" name="add_integral" id="add_integral" class="admin-input-sm"></td>
<td align="center"><input type="text" name="add_icon" id="add_icon" class="admin-input-sm"></td>
<td align="center"><input type="text" name="add_titles" id="add_titles" class="admin-input-sm"></td>
<td align="center">
<td><input type="text" name="add_integral" id="add_integral" class="admin-input-sm"></td>
<td><input type="text" name="add_icon" id="add_icon" class="admin-input-sm"></td>
<td><input type="text" name="add_titles" id="add_titles" class="admin-input-sm"></td>
<td>
<select name="add_isdefault" id="add_isdefault">
<option value="1">是</option>
<option value="0">否</option>


+ 1
- 1
src/admin/templets/plus_main.htm Näytä tiedosto

@@ -29,7 +29,7 @@
</tr>
{/dede:datalist}
<tr>
<td colspan="4"><a href="module_main.php?moduletype=plus" class="btn btn-success btn-sm">上传模块插件</a></td>
<td colspan="4"><a href="module_upload.php" class="btn btn-success btn-sm">上传模块插件</a></td>
</tr>
<tr>
<td bgcolor="#f5f5f5" colspan="4" align="center">{dede:pagelist listsize='6'/}</td>


+ 2
- 2
src/admin/templets/sys_admin_user_add.htm Näytä tiedosto

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>新增帐号</title>
<title>添加管理员</title>
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -37,7 +37,7 @@
<td bgcolor="#f5f5f5" colspan="2">
<table cellspacing="1" cellpadding="1" class="table table-borderless w-100">
<tr>
<td width="30%">新增帐号</td>
<td width="30%">添加管理员</td>
<td width="70%" align="right"><a href="sys_admin_user.php" class="btn btn-success btn-sm">管理帐号</a></td>
</tr>
</table>


+ 2
- 2
src/admin/templets/sys_admin_user_edit.htm Näytä tiedosto

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>修改帐号</title>
<title>修改管理员</title>
<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -14,7 +14,7 @@
<td bgcolor="#f5f5f5" colspan="2">
<table cellspacing="1" cellpadding="1" class="table table-borderless w-100">
<tr>
<td width="30%">修改帐号</td>
<td width="30%">修改管理员</td>
<td width="70%" align="right"><a href="sys_admin_user.php" class="btn btn-success btn-sm">管理帐号</a></td>
</tr>
</table>


+ 1
- 1
src/admin/templets/sys_cache_up.htm Näytä tiedosto

@@ -17,7 +17,7 @@
</tr>
<tr>
<td>
<div class="alert alert-info mb-0">默认执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信 6、删除过期流量统计</div>
<div class="alert alert-info mb-0">默认执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信</div>
</td>
</tr>
<tr>


+ 2
- 5
src/apps/notify.php Näytä tiedosto

@@ -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;
}
}
?>

+ 2
- 5
src/apps/return.php Näytä tiedosto

@@ -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;
}
}
}
?>

+ 4
- 3
src/user/buy_action.php Näytä tiedosto

@@ -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 = "请使用微信扫一扫，扫描二维码支付：<div id='qrcode' style='width:200px; height:200px; margin-top:15px;'></div><br/><a href='buy_action.php?dopost=wechat_ok&buyid={$buyid}' class='btn btn-success btn-sm'>已完成支付</a> <a href='operation.php' class='btn btn-outline-success btn-sm'>返回订单管理</a>";
@@ -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')
}
}
}
?>

Write Preview
Loading…
Peruuta
Tallenna