DedeBIZ
/
DedeV6
关注 2
点赞 0
派生 0
代码 合并请求 0 版本发布 29 动态
浏览代码

调整

tags/6.2.5
叙述、别离 2 年前
父节点
f7778e4914
当前提交
a480fc2572
共有 9 个文件被更改，包括 31 次插入 和 68 次删除
合并视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +1
    -4
      src/admin/content_list.php
  2. +1
    -1
      src/admin/templets/catalog_edit.htm
  3. +2
    -2
      src/admin/templets/file_edit.htm
  4. +1
    -1
      src/admin/templets/member_scores.htm
  5. +19
    -48
      src/admin/templets/sys_payment.htm
  6. +1
    -1
      src/admin/templets/sys_safetest_viewdiff.htm
  7. +2
    -2
      src/admin/templets/tpl_edit.htm
  8. +2
    -2
      src/admin/templets/vote_getcode.htm
  9. +2
    -7
      src/system/archive/listview.class.php

+ 1
- 4
src/admin/content_list.php 查看文件

@@ -85,10 +85,7 @@ if ($cid == 0) {
$positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > "; $positionname = str_replace($cfg_list_symbol, " > ", $tl->GetPositionName())." > ";
} }
//当选择的是单表模型栏目时，直接跳转单表模型管理区 //当选择的是单表模型栏目时，直接跳转单表模型管理区
if (
empty($channelid)
&& isset($tl->TypeInfos['channeltype'])
) {
if (empty($channelid) && isset($tl->TypeInfos['channeltype'])) {
$channelid = $tl->TypeInfos['channeltype']; $channelid = $tl->TypeInfos['channeltype'];
} }
if ($channelid < -1) { if ($channelid < -1) {


+ 1
- 1
src/admin/templets/catalog_edit.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <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/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">


+ 2
- 2
src/admin/templets/file_edit.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <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/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">
@@ -35,7 +35,7 @@
<input type="hidden" name="_csrf_token" value="{dede:global name='csrf_token'/}"> <input type="hidden" name="_csrf_token" value="{dede:global name='csrf_token'/}">
<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3"> <table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
<tr> <tr>
<td colspan="2" bgcolor="#f5f5f5">新建修改文件</td>
<td colspan="2" bgcolor="#f5f5f5">新建/修改文件</td>
</tr> </tr>
<tr> <tr>
<td>工作目录</td> <td>工作目录</td>


+ 1
- 1
src/admin/templets/member_scores.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <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/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">


+ 19
- 48
src/admin/templets/sys_payment.htm 查看文件

@@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
@@ -11,7 +10,6 @@
<script src="../static/web/js/jquery.min.js"></script> <script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/bootstrap.min.js"></script> <script src="../static/web/js/bootstrap.min.js"></script>
</head> </head>

<body> <body>
<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3"> <table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
<tr> <tr>
@@ -19,8 +17,7 @@
<table cellspacing="0" cellpadding="0" class="table table-borderless w-100"> <table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
<tr> <tr>
<td>支付接口设置</td> <td>支付接口设置</td>
<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank"
class="btn btn-success btn-sm">更多接口</a></span></td>
<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank" class="btn btn-success btn-sm">更多接口</a></span></td>
</tr> </tr>
</table> </table>
</td> </td>
@@ -29,24 +26,19 @@
<td colspan="4"> <td colspan="4">
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link active" id="wechat-tab" data-toggle="tab" data-target="#wechat"
type="button" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button>
<button type="button" id="wechat-tab" class="nav-link active" data-toggle="tab" data-target="#wechat" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link" id="alipay-tab" data-toggle="tab" data-target="#alipay" type="button"
role="tab" aria-controls="alipay" aria-selected="false">支付宝</button>
<button type="button" id="alipay-tab" class="nav-link" data-toggle="tab" data-target="#alipay" role="tab" aria-controls="alipay" aria-selected="false">支付宝</button>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link" id="bank-tab" data-toggle="tab" data-target="#bank" type="button"
role="tab" aria-controls="bank" aria-selected="false">银行转帐</button>
<button type="button" id="bank-tab" class="nav-link" data-toggle="tab" data-target="#bank" role="tab" aria-controls="bank" aria-selected="false">银行转帐</button>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link" id="balance-tab" data-toggle="tab" data-target="#balance" type="button"
role="tab" aria-controls="balance" aria-selected="false">余额支付</button>
<button type="button" id="balance-tab" class="nav-link" data-toggle="tab" data-target="#balance" role="tab" aria-controls="balance" aria-selected="false">余额支付</button>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link" id="cod-tab" data-toggle="tab" data-target="#cod" type="button"
role="tab" aria-controls="cod" aria-selected="false">货到付款</button>
<button type="button" id="cod-tab" class="nav-link" data-toggle="tab" data-target="#cod" role="tab" aria-controls="cod" aria-selected="false">货到付款</button>
</li> </li>
</ul> </ul>
<div class="tab-content py-3" id="myTabContent"> <div class="tab-content py-3" id="myTabContent">
@@ -54,9 +46,7 @@
<form> <form>
<div class="form-group"> <div class="form-group">
<label>描述</label> <label>描述</label>
<p>
微信支付是腾讯公司的支付业务品牌，微信支付商户平台支持线下场所、公众号、小程序、PC网站、APP、企业微信等经营场景快速接入微信支付。微信支付全面打通O2O生活消费领域，提供专业的互联网+行业解决方案，微信支付支持微信红包和微信理财通，是移动支付的首选。
</p>
<p>微信支付是腾讯公司的支付业务品牌，微信支付商户平台支持线下场所、公众号、小程序、PC网站、APP、企业微信等经营场景快速接入微信支付。微信支付全面打通O2O生活消费领域，提供专业的互联网+行业解决方案，微信支付支持微信红包和微信理财通，是移动支付的首选。</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iptWechatAppID">AppID</label> <label for="iptWechatAppID">AppID</label>
@@ -82,24 +72,20 @@
<label>商户证书文件</label> <label>商户证书文件</label>
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" id="iptWechatPrivateKey"> <input type="file" class="custom-file-input" id="iptWechatPrivateKey">
<label class="custom-file-label" data-browse="选择"
for="iptWechatPrivateKey">选择商户证书文件...</label>
<label class="custom-file-label" data-browse="选择" for="iptWechatPrivateKey">选择商户证书文件...</label>
</div> </div>
</div> </div>
<div class="form-group form-check"> <div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="WechatEnabled"> <input type="checkbox" class="form-check-input" id="WechatEnabled">
<label class="form-check-label" for="WechatEnabled">是否启用</label>
<label class="form-check-label" for="WechatEnabled"> 是否启用</label>
</div> </div>

</form> </form>
</div> </div>
<div class="tab-pane fade" id="alipay" role="tabpanel" aria-labelledby="alipay-tab"> <div class="tab-pane fade" id="alipay" role="tabpanel" aria-labelledby="alipay-tab">
<form> <form>
<div class="form-group"> <div class="form-group">
<label for="iptAppID">描述</label> <label for="iptAppID">描述</label>
<p>
支付宝，全球领先的独立第三方支付平台，致力于为广大用户提供安全快速的电子支付/网上支付/安全支付/手机支付体验，及转账收款/水电煤缴费/信用卡还款/AA收款等生活服务应用。
</p>
<p>支付宝，全球领先的独立第三方支付平台，致力于为广大用户提供安全快速的电子支付/网上支付/安全支付/手机支付体验，及转账收款/水电煤缴费/信用卡还款/AA收款等生活服务应用。</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iptAlipayAPPID">APPID</label> <label for="iptAlipayAPPID">APPID</label>
@@ -113,24 +99,21 @@
<label>应用公钥证书</label> <label>应用公钥证书</label>
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" id="iptAlipayAppCertPublicKey"> <input type="file" class="custom-file-input" id="iptAlipayAppCertPublicKey">
<label class="custom-file-label" data-browse="选择"
for="iptAlipayAppCertPublicKey">选择应用公钥证书文件...</label>
<label class="custom-file-label" data-browse="选择" for="iptAlipayAppCertPublicKey">选择应用公钥证书文件...</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>支付宝公钥证书</label> <label>支付宝公钥证书</label>
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" id="iptAlipayCertPublicKey"> <input type="file" class="custom-file-input" id="iptAlipayCertPublicKey">
<label class="custom-file-label" data-browse="选择"
for="iptAlipayCertPublicKey">选择支付宝公钥证书文件...</label>
<label class="custom-file-label" data-browse="选择" for="iptAlipayCertPublicKey">选择支付宝公钥证书文件...</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>支付宝根证书</label> <label>支付宝根证书</label>
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input" id="iptAlipayRootCert"> <input type="file" class="custom-file-input" id="iptAlipayRootCert">
<label class="custom-file-label" data-browse="选择"
for="iptAlipayRootCert">选择支付宝根证书文件...</label>
<label class="custom-file-label" data-browse="选择" for="iptAlipayRootCert">选择支付宝根证书文件...</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -139,19 +122,15 @@
</div> </div>
<div class="form-group form-check"> <div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="AlipayEnabled"> <input type="checkbox" class="form-check-input" id="AlipayEnabled">
<label class="form-check-label" for="AlipayEnabled">是否启用</label>
<label class="form-check-label" for="AlipayEnabled"> 是否启用</label>
</div> </div>

</form> </form>

</div> </div>
<div class="tab-pane fade" id="bank" role="tabpanel" aria-labelledby="bank-tab"> <div class="tab-pane fade" id="bank" role="tabpanel" aria-labelledby="bank-tab">
<form> <form>
<div class="form-group"> <div class="form-group">
<label>描述</label> <label>描述</label>
<p>
用户支付到商户指定银行卡账号，手动确认订单收款。
</p>
<p>用户支付到商户指定银行卡账号，手动确认订单收款。</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iptBankAccountName">账户名</label> <label for="iptBankAccountName">账户名</label>
@@ -167,39 +146,32 @@
</div> </div>
<div class="form-group form-check"> <div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="BankEnabled"> <input type="checkbox" class="form-check-input" id="BankEnabled">
<label class="form-check-label" for="BankEnabled">是否启用</label>
<label class="form-check-label" for="BankEnabled"> 是否启用</label>
</div> </div>

</form> </form>
</div> </div>
<div class="tab-pane fade" id="balance" role="tabpanel" aria-labelledby="balance-tab"> <div class="tab-pane fade" id="balance" role="tabpanel" aria-labelledby="balance-tab">
<form> <form>
<div class="form-group"> <div class="form-group">
<label>描述</label> <label>描述</label>
<p>
支持采用积分进行支付。
</p>
<p>支持采用积分进行支付。</p>
</div> </div>
<div class="form-group form-check"> <div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="BalanceEnabled"> <input type="checkbox" class="form-check-input" id="BalanceEnabled">
<label class="form-check-label" for="BalanceEnabled">是否启用</label> <label class="form-check-label" for="BalanceEnabled">是否启用</label>
</div> </div>

</form> </form>
</div> </div>
<div class="tab-pane fade" id="cod" role="tabpanel" aria-labelledby="cod-tab"> <div class="tab-pane fade" id="cod" role="tabpanel" aria-labelledby="cod-tab">
<form> <form>
<div class="form-group"> <div class="form-group">
<label>描述</label> <label>描述</label>
<p>
购买后直接发货，到货后再进行支付。
</p>
<p>购买后直接发货，到货后再进行支付。</p>
</div> </div>
<div class="form-group form-check"> <div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="CodEnabled"> <input type="checkbox" class="form-check-input" id="CodEnabled">
<label class="form-check-label" for="CodEnabled">是否启用</label>
<label class="form-check-label" for="CodEnabled"> 是否启用</label>
</div> </div>

</form> </form>
</div> </div>
<button type="submit" class="btn btn-success">保存</button> <button type="submit" class="btn btn-success">保存</button>
@@ -214,5 +186,4 @@
}); });
</script> </script>
</body> </body>

</html> </html>

+ 1
- 1
src/admin/templets/sys_safetest_viewdiff.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<title>查看差异</title>
<title>查看差异文件</title>
<link rel="stylesheet" href="../static/web/css/diffview.css"> <link rel="stylesheet" href="../static/web/css/diffview.css">
<script src="../static/web/js/jquery.min.js"></script> <script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/diffview.js"></script> <script src="../static/web/js/diffview.js"></script>


+ 2
- 2
src/admin/templets/tpl_edit.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <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/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">
@@ -52,7 +52,7 @@
<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>"> <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3"> <table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
<tr> <tr>
<td bgcolor="#f5f5f5" colspan="2">新建修改模板</td>
<td bgcolor="#f5f5f5" colspan="2">新建/修改模板</td>
</tr> </tr>
<tr> <tr>
<td width="260">文件名称</td> <td width="260">文件名称</td>


+ 2
- 2
src/admin/templets/vote_getcode.htm 查看文件

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <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/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../static/web/css/bootstrap.min.css"> <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/web/css/admin.css"> <link rel="stylesheet" href="../static/web/css/admin.css">
@@ -11,7 +11,7 @@
<body> <body>
<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3"> <table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
<tr> <tr>
<td bgcolor="#f5f5f5" colspan="2"><a href="vote_main.php">投票管理</a> &gt; 获取代码</td>
<td bgcolor="#f5f5f5" colspan="2"><a href="vote_main.php">投票管理</a> &gt; 获取投票代码</td>
</tr> </tr>
<form name="form1" action="tag_test_action.php" target="stafrm" method="post"> <form name="form1" action="tag_test_action.php" target="stafrm" method="post">
<input type="hidden" name="showsource" value="no"> <input type="hidden" name="showsource" value="no">


+ 2
- 7
src/system/archive/listview.class.php 查看文件

@@ -300,10 +300,7 @@ class ListView
} }
if ($startpage == 1) { if ($startpage == 1) {
//如果列表启用封面文件，复制这个文件第一页 //如果列表启用封面文件，复制这个文件第一页
if (
$this->TypeLink->TypeInfos['isdefault'] == 1
&& $this->TypeLink->TypeInfos['ispart'] == 0
) {
if ($this->TypeLink->TypeInfos['isdefault'] == 1 && $this->TypeLink->TypeInfos['ispart'] == 0) {
$onlyrule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], '', $this->Fields['namerule2']); $onlyrule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], '', $this->Fields['namerule2']);
$onlyrule = str_replace("{page}", "1", $onlyrule); $onlyrule = str_replace("{page}", "1", $onlyrule);
$list_1 = $this->GetTruePath().$onlyrule; $list_1 = $this->GetTruePath().$onlyrule;
@@ -327,9 +324,7 @@ class ListView
return; return;
} }
$this->CountRecord(); $this->CountRecord();
if ((empty($this->PageNo) || $this->PageNo == 1)
&& $this->TypeLink->TypeInfos['ispart'] == 1
) {
if ((empty($this->PageNo) || $this->PageNo == 1) && $this->TypeLink->TypeInfos['ispart'] == 1) {
$tmpdir = $GLOBALS['cfg_basedir'].$GLOBALS['cfg_templets_dir']; $tmpdir = $GLOBALS['cfg_basedir'].$GLOBALS['cfg_templets_dir'];
$tempfile = str_replace("{tid}", $this->TypeID, $this->Fields['tempindex']); $tempfile = str_replace("{tid}", $this->TypeID, $this->Fields['tempindex']);
$tempfile = str_replace("{cid}", $this->ChannelUnit->ChannelInfos['nid'], $tempfile); $tempfile = str_replace("{cid}", $this->ChannelUnit->ChannelInfos['nid'], $tempfile);


撰写 预览
正在加载...
取消
保存