Browse Source

调整布局

tags/6.1.9
xushubieli 1 month ago
parent
commit
8f38e2be23
9 changed files with 30 additions and 22 deletions
  1. +8
    -4
      src/admin/article_description_main.php
  2. +7
    -3
      src/admin/makehtml_archives_action.php
  3. +1
    -1
      src/install/index.php
  4. +1
    -1
      src/system/common.inc.php
  5. +1
    -1
      src/user/templets/content_list.htm
  6. +1
    -1
      src/user/templets/content_sg_list.htm
  7. +3
    -3
      src/user/templets/operation.htm
  8. +3
    -3
      src/user/templets/shops_orders.htm
  9. +5
    -5
      src/user/templets/shops_products.htm

+ 8
- 4
src/admin/article_description_main.php View File

@@ -79,8 +79,10 @@ if ($dojob == '') {
$tjlen = 100;
ShowMsg('完成所有任务', 'javascript:;');
exit();
}
$tjsta .= "完成处理文档总数 $tjlen %";
}
$dvlen = $tjlen * 2;
$tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen;height:16px;background:#28a745'></div></div>";
$tjsta .= "<br>完成处理文档总数的 $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 = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen;height:16px;background:#28a745'></div></div>";
$tjsta .= "<br>完成处理文档总数的 $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();
}
} //更新自动分页处理代码结束
}//更新自动分页处理代码结束
}

+ 7
- 3
src/admin/makehtml_archives_action.php View File

@@ -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).",继续执行任务<br>完成创建文件总数 $tjlen %";
$dvlen = $tjlen * 2;
$tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen;height:16px;background:#28a745'></div></div>";
$tjsta .= "<br>本次用时:".number_format($t2, 2).",总用时:$ttime 分钟,到达位置:".($startdd + $pagesize)."<br>完成创建文件总数的 $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");
}


+ 1
- 1
src/install/index.php View File

@@ -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);


+ 1
- 1
src/system/common.inc.php View File

@@ -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 = '织梦内容管理系统';


+ 1
- 1
src/user/templets/content_list.htm View File

@@ -60,7 +60,7 @@
<th width="12%">类目</th>
<th width="10%">状态</th>
<th width="10%">点击</th>
<th width="16%">时间</th>
<th width="12%">时间</th>
<th align="center">操作</th>
</tr>
</thead>


+ 1
- 1
src/user/templets/content_sg_list.htm View File

@@ -60,7 +60,7 @@
<th width="12%">类目</th>
<th width="10%">状态</th>
<th width="10%">点击</th>
<th width="16%">时间</th>
<th width="12%">时间</th>
<th align="center">操作</th>
</tr>
</thead>


+ 3
- 3
src/user/templets/operation.htm View File

@@ -28,10 +28,10 @@
<thead>
<tr>
<th width="30%" colspan="2">订单号</th>
<th width="10%">状态</th>
<th width="14%">状态</th>
<th width="10%">产品</th>
<th width="12%">状态</th>
<th width="16%">时间</th>
<th width="14%">状态</th>
<th width="12%">时间</th>
</tr>
</thead>
<tbody>


+ 3
- 3
src/user/templets/shops_orders.htm View File

@@ -46,10 +46,10 @@
<thead>
<tr>
<th width="30%" colspan="2">订单号</th>
<th width="10%">状态</th>
<th width="14%">状态</th>
<th width="10%">数量</th>
<th width="12%">总计(元)</th>
<th width="16%">时间</th>
<th width="14%">总计</th>
<th width="12%">时间</th>
</tr>
</thead>
<form name="form1" action="shops_orders.php" method="post">


+ 5
- 5
src/user/templets/shops_products.htm View File

@@ -102,11 +102,11 @@
<table cellspacing="1" class="table">
<thead>
<tr>
<th width="25%" colspan="2">订单号</th>
<th>名称</th>
<th width="10%" align="center">数量</th>
<th width="12%">单价(元)</th>
<th width="15%" align="center">时间</th>
<th width="30%" colspan="2">订单号</th>
<th width="14%">名称</th>
<th width="10%">数量</th>
<th width="14%">单价</th>
<th width="12%">时间</th>
</tr>
</thead>
<form name="form1" action="shops_products.php" method="post">


Loading…
Cancel
Save