diff --git a/README.md b/README.md index 9f987510..fa5fcc74 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ DedeBIZ系统基于PHP7版本开发,具有很强的可扩展性,并且完全 DedeV6.x是一个LTS版本,支持将到2025年10月截止,目前DedeV6已经发布,可以[点击下载](https://www.dedebiz.com/download)获取 +![DedeBIZ](docs/dedebiz.jpg) + ## 参与开源 访问[代码托管](https://www.dedebiz.com/git),可以看到我们已经将代码托管在几个知名代码托管平台,可以通过提交Pull requests的方式来贡献您的力量 @@ -89,15 +91,17 @@ Sockets:支持接入DedeBIZ商业组件模块 ``` NAME: - DedeBIZ Cli Tools + DedeBIZ命令行工具 USAGE: php ./dedebiz command [arguments...] COMMANDS: - serv,s Run cli web server for DedeBIZ - make,m Make DedeBIZ HTML - update,u Update to latest system - help,h Shows a list of commands or help - quick,q Quick start a development environment + serv,s 运行DedeBIZ开发服务 + make,m 更新网页 + update,u 更新到最新系统 + help,h Shows 帮助 + quick,q 快速开始一个开发环境 + tdata 生成测试数据 + pwd 更改管理员密码 WEBSITE: https://www.dedebiz.com/help/ ``` diff --git a/docs/dedebiz.jpg b/docs/dedebiz.jpg new file mode 100644 index 00000000..7a2674b1 Binary files /dev/null and b/docs/dedebiz.jpg differ diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 35fb3a53..340e8542 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -82,12 +82,11 @@ if ($dopost == "view") { $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($homeFile); echo ""; - echo "
更新首页模式:".$position." 浏览
"; + ShowMsg("更新首页模式", $position, 0, -1, '浏览', '_blank'); } else { //动态浏览 if (file_exists($homeFile)) @unlink($homeFile); - echo ""; - echo "
动态浏览模式:浏览
"; + ShowMsg("动态浏览模式", '../index.php', 0, -1,'浏览', '_blank'); } $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'"; $dsql->ExecuteNoneQuery($iquery); diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php index b9cc02cd..57aa0f71 100644 --- a/src/admin/makehtml_spec.php +++ b/src/admin/makehtml_spec.php @@ -15,8 +15,7 @@ if ($dopost == "ok") { require_once(DEDEINC."/archive/specview.class.php"); $sp = new SpecView(); $rurl = $sp->MakeHtml(0); - echo ""; - echo "
完成所有专题更新,浏览专题
"; + ShowMsg("完成所有专题更新", $rurl, 0, -1,'浏览专题', '_blank'); exit(); } include DedeInclude('templets/makehtml_spec.htm'); diff --git a/src/system/common.func.php b/src/system/common.func.php index 0692af66..b1c6fd5d 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -320,9 +320,11 @@ if (!function_exists('file_put_contents')) { * @param string $gourl 跳转地址 * @param int $onlymsg 仅显示信息 * @param int $limittime 限制时间 + * @param string $btnmsg 按钮提示 + * @param string $target 跳转类型 * @return void */ -function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) +function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0, $btnmsg='点击反应', $target="_self") { if (isset($GLOBALS['format']) && strtolower($GLOBALS['format'])==='json') { echo json_encode(array( @@ -358,8 +360,8 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0) $rmsg .= "document.write(\""; if ($onlymsg == 0) { if ($gourl != 'javascript:;' && $gourl != '') { - $rmsg .= "
点击反应
\");"; - $rmsg .= "setTimeout('JumpUrl()',$litime);"; + $rmsg .= "
{$btnmsg}
\");"; + $rmsg .= $litime > 0? "setTimeout('JumpUrl()',$litime);" : ""; } else { $rmsg .= "\");"; }