From 8f38e2be23865c4551dbad1d51d108ce571bd102 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Wed, 4 May 2022 17:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/article_description_main.php | 12 ++++++++---- src/admin/makehtml_archives_action.php | 10 +++++++--- src/install/index.php | 2 +- src/system/common.inc.php | 2 +- src/user/templets/content_list.htm | 2 +- src/user/templets/content_sg_list.htm | 2 +- src/user/templets/operation.htm | 6 +++--- src/user/templets/shops_orders.htm | 6 +++--- src/user/templets/shops_products.htm | 10 +++++----- 9 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 7445fb9b..4573f098 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -79,8 +79,10 @@ if ($dojob == '') { $tjlen = 100; ShowMsg('完成所有任务', 'javascript:;'); exit(); - } - $tjsta .= "完成处理文档总数 $tjlen %"; + } + $dvlen = $tjlen * 2; + $tjsta = "
"; + $tjsta .= "
完成处理文档总数的 $tjlen %"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); exit(); @@ -138,7 +140,9 @@ if ($dojob == '') { } else { $tjlen = 100; } - $tjsta .= "完成处理文档总数 $tjlen %"; + $dvlen = $tjlen * 2; + $tjsta = "
"; + $tjsta .= "
完成处理文档总数的 $tjlen %"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); @@ -147,5 +151,5 @@ if ($dojob == '') { ShowMsg('完成所有任务', 'javascript:;'); exit(); } - } //更新自动分页处理代码结束 + }//更新自动分页处理代码结束 } \ No newline at end of file diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index e8ecc550..b015ec12 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -75,9 +75,13 @@ while ($row = $dsql->GetObject('out')) { } $t2 = ExecTime(); $t2 = ($t2 - $est1); +$ttime = time() - $sstime; +$ttime = number_format(($ttime / 60), 2); //返回提示信息 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100; -$tjsta .= "到达位置：".($startdd + $pagesize)."，继续执行任务
完成创建文件总数 $tjlen %"; +$dvlen = $tjlen * 2; +$tjsta = "
"; +$tjsta .= "
本次用时：".number_format($t2, 2)."，总用时：$ttime 分钟，到达位置：".($startdd + $pagesize)."
完成创建文件总数的 $tjlen %"; //速度测试 if ($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; @@ -87,10 +91,10 @@ if ($tjnum < $totalnum) { exit(); } else { if ($typeid != '') { - ShowMsg("生成文件：$totalnum，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); + ShowMsg("生成文件：$totalnum，总用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { - ShowMsg("完成所有任务", "javascript:;"); + ShowMsg("生成文件：$totalnum，总用时：{$ttime} 分钟，完成所有所有任务", "javascript:;"); } else { ShowMsg("完成文档更新任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } diff --git a/src/install/index.php b/src/install/index.php index 8cca51c4..546875b9 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -15,7 +15,7 @@ if(file_exists(INSLOCKFILE)) } $verMsg = 'V6'; $dfDbname = 'DedeBIZ'; -$cfg_version_detail = '6.1.9'; //详细版本号 +$cfg_version_detail = '6.1.9beta'; //详细版本号 $errmsg = ''; if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) { mysqli_report(MYSQLI_REPORT_OFF); diff --git a/src/system/common.inc.php b/src/system/common.inc.php index dfe21f16..01ac3572 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -185,7 +185,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft'; $cfg_other_medias = $cfg_medias_dir.'/media'; //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息 $cfg_version = 'V6'; -$cfg_version_detail = '6.1.9'; //详细版本号 +$cfg_version_detail = '6.1.9beta'; //详细版本号 $cfg_soft_lang = 'utf-8'; $cfg_soft_public = 'base'; $cfg_softname = '织梦内容管理系统'; diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index 2462ebbf..2aa517b4 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -60,7 +60,7 @@ 类目 状态 点击 - 时间 + 时间 操作 diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index 7e4ec322..d77842a3 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -60,7 +60,7 @@ 类目 状态 点击 - 时间 + 时间 操作 diff --git a/src/user/templets/operation.htm b/src/user/templets/operation.htm index 334ca8d9..35af0fd4 100755 --- a/src/user/templets/operation.htm +++ b/src/user/templets/operation.htm @@ -28,10 +28,10 @@ 订单号 - 状态 + 状态 产品 - 状态 - 时间 + 状态 + 时间 diff --git a/src/user/templets/shops_orders.htm b/src/user/templets/shops_orders.htm index f7300a5a..aaf71626 100755 --- a/src/user/templets/shops_orders.htm +++ b/src/user/templets/shops_orders.htm @@ -46,10 +46,10 @@ 订单号 - 状态 + 状态 数量 - 总计（元） - 时间 + 总计 + 时间
diff --git a/src/user/templets/shops_products.htm b/src/user/templets/shops_products.htm index 0d08aa45..f370c679 100755 --- a/src/user/templets/shops_products.htm +++ b/src/user/templets/shops_products.htm @@ -102,11 +102,11 @@ - - - - - + + + + +
订单号名称数量单价（元）时间订单号名称数量单价时间