From 682d59045e3b4691fde736123a8c38b3f8180ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <2449271624@qq.com> Date: Wed, 15 Nov 2023 11:10:46 +0800 Subject: [PATCH] =?UTF-8?q?6.3.0=E7=89=B9=E5=BE=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=9D=BF=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/diy_list.php | 4 ++-- src/admin/feedback_main.php | 2 +- src/admin/friendlink_main.php | 4 ++-- src/admin/index_body.php | 5 +++-- src/admin/templets/diy_list.htm | 2 +- src/admin/templets/friendlink_edit.htm | 2 +- src/admin/templets/index_body.htm | 12 +++++------ src/admin/templets/member_main.htm | 2 +- src/admin/templets/mychannel_add.htm | 2 +- src/admin/templets/mychannel_edit.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/soft_edit.htm | 2 +- src/apps/diy.php | 2 +- src/apps/view.php | 2 +- src/static/web/css/admin.css | 5 +++-- src/static/web/css/style.css | 3 ++- src/static/web/js/admin.body.js | 30 ++++++++++++-------------- src/theme/dedebiz/index.htm | 8 +++---- src/theme/dedebiz/list_article.htm | 2 +- src/theme/dedebiz/list_default.htm | 2 +- src/theme/dedebiz/list_default_sg.htm | 2 +- src/theme/dedebiz/list_free.htm | 2 +- src/theme/dedebiz/list_image.htm | 2 +- src/theme/dedebiz/list_infos.htm | 2 +- src/theme/dedebiz/list_soft.htm | 2 +- src/theme/dedebiz/list_spec.htm | 2 +- src/theme/dedebiz/search.htm | 2 +- src/theme/dedebiz/taglist.htm | 2 +- src/user/templets/content_list.htm | 4 ++-- src/user/templets/content_sg_list.htm | 4 ++-- src/user/templets/index.htm | 6 +++--- src/user/templets/menu.htm | 2 +- src/user/templets/space.htm | 2 +- 33 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/admin/diy_list.php b/src/admin/diy_list.php index 6862c37e..9cd61111 100644 --- a/src/admin/diy_list.php +++ b/src/admin/diy_list.php @@ -94,7 +94,7 @@ if ($action == 'post') { $query = "SELECT * FROM {$diy->table} WHERE id=$id"; $row = $dsql->GetOne($query); if (!is_array($row)) { - showmsg("您浏览的记录不存在或未审核", '-1'); + showmsg("您浏览的记录不存在或待审核", '-1'); exit(); } $postform = $diy->getForm('edit', $row, 'admin'); @@ -201,7 +201,7 @@ if ($action == 'post') { { echo "".$arr[$key].""; } - $status = $arr['ifcheck'] == 1 ? '已审核' : '未审核'; + $status = $arr['ifcheck'] == 1 ? '已审核' : '待审核'; echo "".$status.""; echo ""; } diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php index 6741f035..e61f7c60 100644 --- a/src/admin/feedback_main.php +++ b/src/admin/feedback_main.php @@ -16,7 +16,7 @@ require_once(DEDEINC."/typelink/typelink.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); function IsCheck($st) { - return $st == 1 ? '已审核':'未审核'; + return $st == 1 ? '已审核':'待审核'; } function jsTrimjajx($str, $len) { diff --git a/src/admin/friendlink_main.php b/src/admin/friendlink_main.php index 51058a6c..07d408b6 100644 --- a/src/admin/friendlink_main.php +++ b/src/admin/friendlink_main.php @@ -21,7 +21,7 @@ if (empty($ischeck)) { else $ischeckSql = " And ischeck='$ischeck' "; } $keyword = HtmlReplace($keyword, -1); -$selCheckArr = array(0 => '不限类型', -1 => '未审核', 1 => '内页', 2 => '首页'); +$selCheckArr = array(0 => '不限类型', -1 => '待审核', 1 => '内页', 2 => '首页'); $sql = "SELECT * FROM `#@__flink` WHERE CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime DESC"; $dlist = new DataListCP(); $dlist->SetParameter('keyword', $keyword); @@ -38,6 +38,6 @@ function GetSta($sta) { if ($sta == 1) return '内页'; if ($sta == 2) return '首页'; - else return '未审核'; + else return '待审核'; } ?> \ No newline at end of file diff --git a/src/admin/index_body.php b/src/admin/index_body.php index 8805d849..dc785575 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -53,9 +53,10 @@ if (empty($dopost)) { if (trim($row['editcon']) == '') { $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank'] == -1? " 未审核" : ""; + $rowarcrank = $row['arcrank'] == -1 ? '待审核':'已审核'; $pubdate = GetDateMk($row['pubdate']); - echo "{$row['title']}{$rowarcrank}{$pubdate}"; + echo " + {$row['title']}{$rowarcrank}{$pubdate}"; } } else { ?> diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 82089a7d..60100593 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -43,7 +43,7 @@ diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index 427ab45a..1f99edb6 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -47,7 +47,7 @@ 链接位置： - + diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 5b39dce1..3efff7c6 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -69,37 +69,37 @@ diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index e4378f7a..12ad6614 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -92,7 +92,7 @@ diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 8da00f9a..c479fc00 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -99,7 +99,7 @@ diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index f87c26c1..7f340375 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -450,7 +450,7 @@ diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 02907b8f..dd0cf282 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -411,7 +411,7 @@ - + diff --git a/src/apps/diy.php b/src/apps/diy.php index e78a5f14..44e255e4 100755 --- a/src/apps/diy.php +++ b/src/apps/diy.php @@ -111,7 +111,7 @@ if ($action == 'post') { $row = $dsql->GetOne($query); if (!is_array($row)) { - showmsg('您浏览的记录不存在或未审核', '-1'); + showmsg('您浏览的记录不存在或待审核', '-1'); exit(); } $fieldlist = $diy->getFieldList(); diff --git a/src/apps/view.php b/src/apps/view.php index 6ab7ac3e..8ddcad03 100755 --- a/src/apps/view.php +++ b/src/apps/view.php @@ -24,7 +24,7 @@ $needRank = $arc->Fields['arcrank']; require_once(DEDEINC.'/memberlogin.class.php'); $cfg_ml = new MemberLogin(); if ($needRank < 0 && $arc->Fields['mid'] != $cfg_ml->M_ID) { - ShowMsg('文档未审核，暂时无法浏览', 'javascript:;'); + ShowMsg('文档待审核，暂时无法浏览', 'javascript:;'); exit(); } //设置了权限限制的文档 diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 47615a4f..7aa1c904 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -68,7 +68,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s} .sidemenu .submenu-right{float:right!important;padding:0 20px 0 0!important} .body-right{position:absolute;top:60px;right:0;bottom:0} .body-right iframe{width:100%;height:99%;border:0} -.web-info{padding:10px;background:var(--light);text-overflow:ellipsis;white-space:nowrap} +.web-info{padding:10px;background:var(--light)} #_fileList,#_verList{height:350px;overflow-y:auto} #_msgInfo{display:none} .update-close{background:var(--white);border:0} @@ -142,6 +142,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s} .card-header{padding:0.5rem 1rem;background-color:rgba(0,0,0,.02)} .card-body{padding:0.5rem} .card-body canvas{height:360px!important} +.no-wrap{white-space:nowrap} .fileinput-button{display:inline-block;position:relative;overflow:hidden} .fileinput-button input{position:absolute;top:0;right:0;margin:0;opacity:0;direction:ltr;cursor:pointer} .maintable{width:98%!important;border:1px solid var(--gray-300)!important} @@ -172,7 +173,7 @@ table,input,select,textarea,.login-box,.colordlg,.pubdlg,.quickselitem .topcat,. .btn+.btn{margin-left:10px} @media (min-width:1200px){.modal-dialog{max-width:500px} } -@media (max-width:768px){td{text-overflow:ellipsis;white-space:nowrap} +@media (max-width:768px){td{white-space:nowrap} .install-box,.login-from,.tips-box{width:100%} .tips{padding:0 1rem} } \ No newline at end of file diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 597f7111..7b1f33a3 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -109,7 +109,8 @@ input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkb #validateimg,.btn-send{border-radius:0 0.5rem 0.5rem 0!important} #returntop{display:none;position:fixed;padding:10px 15px;right:1rem;bottom:1rem;color:var(--white);cursor:pointer;background:var(--orange);border-radius:0.5rem;border:0;z-index:9998} #returntop:hover{background:var(--orange)} -@media (max-width:768px){.login-from{width:100%} +@media (max-width:768px){.pb-m-3{padding-bottom:1rem} +.login-from{width:100%} .bannr-img,.item-theme-img img,.list-article-img img{height:250px} .item-news-img img{height:210px} .feedbacks .feedback-action{float:none} diff --git a/src/static/web/js/admin.body.js b/src/static/web/js/admin.body.js index 0f3a42c5..48c2cfd9 100644 --- a/src/static/web/js/admin.body.js +++ b/src/static/web/js/admin.body.js @@ -134,17 +134,15 @@ async function LoadStatChart() { }); } $(document).ready(function() { - $(function() { - $.get("index_testenv.php",function(data) { - if (data !== '') { - $("#body-tips").html(data); - } - }); - $.get("index_body.php?dopost=get_articles",function(data) { - if (data !== '') { - $("#system-word").html(data); - } - }); + $.get("index_testenv.php",function(data) { + if (data !== '') { + $("#body-tips").html(data); + } + }); + $.get("index_body.php?dopost=get_articles",function(data) { + if (data !== '') { + $("#system-word").html(data); + } }); $(function() { var dedebizInfo; @@ -160,25 +158,25 @@ $(document).ready(function() { if (typeof rsp.result.domain !== "undefined") { infoStr += `
-
+

操作系统

 -
+

WEB服务器

 -
+

IP地址

 -
+

PHP版本

 -
+

数据库版本

GetVersion();?>
-
+

上传限制

diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 3a06128d..b5fb1c94 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -69,7 +69,7 @@
{dede:field.mid/} - ";};echo ' '.$fields['userid'].'';if ($fields['spacesta']==-2) echo ' 禁言';if ($fields['spacesta']==-1) echo ' 未审核';?> + ";};echo ' '.$fields['userid'].'';if ($fields['spacesta']==-2) echo ' 禁言';if ($fields['spacesta']==-1) echo ' 待审核';?> {dede:field.matt function="GetMAtt(@me)"/} {dede:field.uname/}
会员投稿默认状态： - +
会员投稿默认状态： - + 文件名称： 文件名称：
-
+

授权域名

${rsp.result.domain}
-
+

站点名称

${rsp.result.title}
-
+

授权证书

查看证书
-
+

授权时间

${rsp.result.auth_at}
@@ -191,7 +189,7 @@ $(document).ready(function() { $("#system-info").html(` diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index ec2e2ba9..d23fadf9 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -22,7 +22,7 @@
@@ -47,7 +47,7 @@ = 0) echo '已审核'; else if ($fields['arcrank'] == -2) echo '失败'; - else echo '未审核'; + else echo '待审核'; ?>
diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index 9f22188c..7dc8d351 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -41,15 +41,15 @@
    -
  • +
  • 消息管理
    • -
  • +
  • 文档管理
    • -
  • +
  • 我的收藏
    • diff --git a/src/user/templets/menu.htm b/src/user/templets/menu.htm index e0b97a51..c020af93 100644 --- a/src/user/templets/menu.htm +++ b/src/user/templets/menu.htm @@ -5,7 +5,7 @@ while ($channel = $dsql->GetArray('addmod')) { $channels[$channel['id']] = $channel; } ?> -
    +
    • 会员面板
    • diff --git a/src/user/templets/space.htm b/src/user/templets/space.htm index 28c5a1bb..3bcadbc5 100755 --- a/src/user/templets/space.htm +++ b/src/user/templets/space.htm @@ -13,7 +13,7 @@
      -
      +
-
+

${rsp.msg}

您已购买了商业版授权，登录DedeBIZ官网会员中心可查看相关授权信息
diff --git a/src/theme/dedebiz/index.htm b/src/theme/dedebiz/index.htm index 7bd460e7..e1a71211 100644 --- a/src/theme/dedebiz/index.htm +++ b/src/theme/dedebiz/index.htm @@ -16,8 +16,8 @@ {dede:include filename='head.htm'/}
-
{dede:include filename='widget_recommend.htm'/}
-
+
{dede:include filename='widget_recommend.htm'/}
+
{dede:channelartlist typeid='3,3'} -
+

{dede:field.typename/}

    {dede:arclist row='10' titlelen='110' orderby='id'} @@ -116,7 +116,7 @@
{/dede:channelartlist}{dede:channelartlist typeid='4,4'} -
+

{dede:field.typename/}

    {dede:arclist row='10' titlelen='110' orderby='id'} diff --git a/src/theme/dedebiz/list_article.htm b/src/theme/dedebiz/list_article.htm index d0ce251b..7f35ebd3 100644 --- a/src/theme/dedebiz/list_article.htm +++ b/src/theme/dedebiz/list_article.htm @@ -24,7 +24,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/theme/dedebiz/list_default.htm b/src/theme/dedebiz/list_default.htm index d0ce251b..7f35ebd3 100644 --- a/src/theme/dedebiz/list_default.htm +++ b/src/theme/dedebiz/list_default.htm @@ -24,7 +24,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/theme/dedebiz/list_default_sg.htm b/src/theme/dedebiz/list_default_sg.htm index d0ce251b..7f35ebd3 100644 --- a/src/theme/dedebiz/list_default_sg.htm +++ b/src/theme/dedebiz/list_default_sg.htm @@ -24,7 +24,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/theme/dedebiz/list_free.htm b/src/theme/dedebiz/list_free.htm index 07ce256e..1e68759c 100644 --- a/src/theme/dedebiz/list_free.htm +++ b/src/theme/dedebiz/list_free.htm @@ -24,7 +24,7 @@
-
+
{dede:freelist/}
    {dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}
diff --git a/src/theme/dedebiz/list_image.htm b/src/theme/dedebiz/list_image.htm index 6d9783db..05aef65f 100644 --- a/src/theme/dedebiz/list_image.htm +++ b/src/theme/dedebiz/list_image.htm @@ -24,7 +24,7 @@
-
+
{dede:list pagesize='10' titlelen='230'}
diff --git a/src/theme/dedebiz/list_infos.htm b/src/theme/dedebiz/list_infos.htm index b8d71395..1f69c869 100644 --- a/src/theme/dedebiz/list_infos.htm +++ b/src/theme/dedebiz/list_infos.htm @@ -25,7 +25,7 @@
-
+
{dede:infolink}
diff --git a/src/theme/dedebiz/list_soft.htm b/src/theme/dedebiz/list_soft.htm index 6d9783db..05aef65f 100644 --- a/src/theme/dedebiz/list_soft.htm +++ b/src/theme/dedebiz/list_soft.htm @@ -24,7 +24,7 @@
-
+
{dede:list pagesize='10' titlelen='230'}
diff --git a/src/theme/dedebiz/list_spec.htm b/src/theme/dedebiz/list_spec.htm index 35ae5393..b9c4c4d3 100644 --- a/src/theme/dedebiz/list_spec.htm +++ b/src/theme/dedebiz/list_spec.htm @@ -24,7 +24,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/theme/dedebiz/search.htm b/src/theme/dedebiz/search.htm index 2d1b009e..93410204 100644 --- a/src/theme/dedebiz/search.htm +++ b/src/theme/dedebiz/search.htm @@ -19,7 +19,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/theme/dedebiz/taglist.htm b/src/theme/dedebiz/taglist.htm index b7eef928..d3cf7edb 100644 --- a/src/theme/dedebiz/taglist.htm +++ b/src/theme/dedebiz/taglist.htm @@ -25,7 +25,7 @@
-
{dede:list pagesize='10' titlelen='230'} +
{dede:list pagesize='10' titlelen='230'}

[field:title/]

diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index f0533083..835a259b 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -22,7 +22,7 @@
@@ -47,7 +47,7 @@ =0) echo '已审核'; else if ($fields['arcrank']==-2) echo '失败'; - else echo '未审核'; + else echo '待审核'; ?>