From c83331e2695ad5a02e07d35a945eba7d77c4d1d1 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: Fri, 18 Aug 2023 10:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E5=8F=8A?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=96=B9=E9=9D=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/index_body.php | 2 +- src/admin/js/body.js | 9 +- src/admin/templets/catalog_add.htm | 5 +- src/admin/templets/catalog_add_quick.htm | 1 + src/admin/templets/catalog_edit.htm | 2 +- src/admin/templets/index_body.htm | 2 +- src/admin/templets/member_scores.htm | 1 + src/admin/templets/mychannel_modifysearch.htm | 1 + src/admin/templets/sys_info.htm | 114 +++++++++-------- src/static/web/css/admin.css | 116 ++++++++++-------- src/user/index.php | 14 +-- 11 files changed, 135 insertions(+), 132 deletions(-) diff --git a/src/admin/index_body.php b/src/admin/index_body.php index 403e9d16..e423f53f 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -38,7 +38,7 @@ if (empty($dopost)) { $admin_catalog = join(',', $admin_catalogs); $userCatalogSql = "AND arc.typeid IN($admin_catalog) "; } - $query = "SELECT arc.id, arc.arcrank, arc.title, arc.typeid, arc.mid, arc.pubdate, arc.channel, ch.editcon, tp.typename FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank<>-2 {$userCatalogSql} AND arc.mid={$cuserLogin->getUserID()} ORDER BY arc.id DESC LIMIT 0,13"; + $query = "SELECT arc.id, arc.arcrank, arc.title, arc.typeid, arc.mid, arc.pubdate, arc.channel, ch.editcon, tp.typename FROM `#@__archives` arc LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank<>-2 {$userCatalogSql} AND arc.mid={$cuserLogin->getUserID()} ORDER BY arc.id DESC LIMIT 0,10"; $arcArr = array(); $dsql->Execute('m', $query); while($row = $dsql->GetArray('m')) diff --git a/src/admin/js/body.js b/src/admin/js/body.js index 97e1b9f1..a148b20d 100644 --- a/src/admin/js/body.js +++ b/src/admin/js/body.js @@ -198,6 +198,7 @@ async function LoadStatChart() { type: 'line', options: { responsive: true, + maintainAspectRatio: false, plugins: { legend: { position: 'right', @@ -212,28 +213,28 @@ async function LoadStatChart() { data: pvs, lineTension: .5, borderColor: 'rgba(54, 162, 235, 1)', - backgroundColor: 'rgba(54, 162, 235, 0.2)', + backgroundColor: 'rgba(54, 162, 235, 0.1)', borderWidth: 2 }, { label: 'UV', data: uvs, lineTension: .5, borderColor: 'rgba(255, 206, 86, 1)', - backgroundColor: 'rgba(255, 206, 86, 0.2)', + backgroundColor: 'rgba(255, 206, 86, 0.1)', borderWidth: 2 }, { label: 'IP', data: ips, lineTension: .5, borderColor: 'rgba(255, 99, 132, 1)', - backgroundColor: 'rgba(255, 99, 132, 0.2)', + backgroundColor: 'rgba(255, 99, 132, 0.1)', borderWidth: 2 }, { label: 'VV', data: vvs, lineTension: .5, borderColor: 'rgba(75, 192, 192, 1)', - backgroundColor: 'rgba(75, 192, 192, 0.2)', + backgroundColor: 'rgba(75, 192, 192, 0.1)', borderWidth: 2 } ] diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 8bfc6950..dc9aaa6c 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -8,6 +8,7 @@ + @@ -297,11 +298,9 @@ } function checkSubmit() { if (document.form1.typename.value == "") { - alert("栏目名称不能为空"); - document.form1.typename.focus(); + ShowMsg("栏目名称不能为空"); return false; } - return true; } function SelectTemplets(fname) { var pos = GetWinPos(800,600); diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 4f251264..612ab522 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -8,6 +8,7 @@ + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 58c83f38..a6c51677 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -328,7 +328,7 @@ } function checkSubmit() { if (document.form1.typename.value == "") { - alert("栏目名称不能为空"); + ShowMsg("栏目名称不能为空"); document.form1.typename.focus(); return false; } diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index af9932a5..7d4378dd 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -124,7 +124,7 @@
流量统计图
-
+
diff --git a/src/admin/templets/member_scores.htm b/src/admin/templets/member_scores.htm index 894674aa..2c08b528 100644 --- a/src/admin/templets/member_scores.htm +++ b/src/admin/templets/member_scores.htm @@ -8,6 +8,7 @@ + diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm index e0a860b6..251998f8 100644 --- a/src/admin/templets/mychannel_modifysearch.htm +++ b/src/admin/templets/mychannel_modifysearch.htm @@ -8,6 +8,7 @@ + diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm index 4bff0253..d999047d 100644 --- a/src/admin/templets/sys_info.htm +++ b/src/admin/templets/sys_info.htm @@ -39,51 +39,48 @@ 添加变量 - - -
- - - - - - - - - - - - - - - - - - - -
变量说明：变量值：
变量名称：
变量类型： - - - - - - 变量所属： - "; - foreach($ds as $dl){ - $dl = trim($dl); - if (empty($dl)) continue; - $dls = explode(',',$dl); - echo ""; - } - echo ""; - ?> - -
-
- - +
@@ -132,7 +129,7 @@ echo ""; } else if ($row['type']=='img') { echo " "; - if ($row['value']){ + if ($row['value']) { echo " "; } else { echo " "; @@ -164,8 +161,7 @@