系统优化，兼容优化

src/admin/css/login.min.css

@@ -1 +1 @@
-body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.mb-6{margin-bottom:6.5rem!important}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.35rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}
+body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.mb-6{margin-bottom:6.5rem!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:0 auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.35rem;border:0}.browsehappy-close{float:right;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}

src/admin/inc/inc_menu.php

@@ -106,6 +106,7 @@ $adminMenu1
     <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新列表' link='makehtml_freelist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
 <m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa-user-circle'>

src/admin/makehtml_all.php

@@ -46,7 +46,7 @@ if ($action == '') {
         } else {
             if (file_exists($homeFile)) echo "启用静态更新，建议删除"+$homeFile;
         }
-        ShowMsg("完成所有文档更新，开始更新栏目", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue");
+        ShowMsg("完成所有文档更新，开始更新所有栏目", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue");
         exit();
     }
     //更新栏目
@@ -94,11 +94,11 @@ if ($action == '') {
             }
             fwrite($fp, "?".">");
             fclose($fp);
-            ShowMsg("完成栏目缓存处理，开始更新栏目", "makehtml_list_action.php?gotype=mkall");
+            ShowMsg("完成栏目缓存处理，开始更新所有栏目", "makehtml_list_action.php?gotype=mkall");
             exit();
         } else {
             fclose($fp);
-            ShowMsg("没有可更新的栏目，最后数据优化", "makehtml_all.php?action=make&step=10");
+            ShowMsg("没有可更新的栏目，数据已优化", "makehtml_all.php?action=make&step=10");
             exit();
         }
     }

src/admin/makehtml_freelist_action.php

@@ -28,7 +28,7 @@ $totalpage = count($idArray);
 if (isset($idArray[$pageno])) {
     $lid = $idArray[$pageno];
 } else {
-    ShowMsg("完成所有文件更新", 'javascript:;');
+    ShowMsg("完成所有列表更新", 'javascript:;');
     exit();
 }
 $lv = new FreeList($lid);
@@ -50,14 +50,14 @@ if ($ntotalpage <= $maxpagesize) {
 $lv->Close();
 $nextpage = $pageno + 1;
 if ($nextpage == $totalpage) {
-    ShowMsg("完成所有文件更新", 'javascript:;');
+    ShowMsg("完成所有列表更新", 'javascript:;');
 } else {
     if ($finishType) {
         $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage";
-        ShowMsg("更新列表<span class='text-primary'>".$tid."</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新列表<span class='text-primary'>".$tid."</span>，继续更新列表", $gourl, 0, 100);
     } else {
         $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno";
-        ShowMsg("更新列表<span class='text-primary'>".$tid."</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新列表<span class='text-primary'>".$tid."</span>，继续更新列表", $gourl, 0, 100);
     }
 }
 $dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' where aid='$startid';");

src/admin/makehtml_list_action.php

@@ -55,7 +55,7 @@ if (isset($idArray[$pageno])) {
         ShowMsg("完成所有栏目更新", "javascript:;");
         exit();
     } else if ($gotype == 'mkall' || $gotype == 'mkallct') {
-        ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10");
+        ShowMsg("完成所有栏目更新，数据已优化", "makehtml_all.php?action=make&step=10");
         exit();
     }
 }
@@ -102,18 +102,18 @@ if ($nextpage >= $totalpage && $finishType) {
         ShowMsg("完成所有栏目更新，<a href='$reurl' target='_blank'>浏览栏目</a>", "javascript:;");
         exit();
     } else if ($gotype == 'mkall' || $gotype == 'mkallct') {
-        ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10");
+        ShowMsg("完成所有栏目更新，数据已优化", "makehtml_all.php?action=make&step=10");
         exit();
     }
 } else {
     $typename = isset($cfg_Cs[$tid][3])? base64_decode($cfg_Cs[$tid][3]) : "";
     if ($finishType) {
         $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage";
-        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续更新栏目", $gourl, 0, 100);
         exit();
     } else {
         $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno";
-        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目<span class='text-primary'>（id：".$tid."）{$typename}</span>，继续更新栏目", $gourl, 0, 100);
         exit();
     }
 }

src/admin/makehtml_taglist_action.php

@@ -45,7 +45,7 @@ if ($ctagid == 0 && $allfinish) {
     $dlist->SetTagsDir($tagsdir);
     $dlist->MakeHtml(1, 10);
     $reurl = '..'.$tagsdir;
-    ShowMsg("更新标签，<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
+    ShowMsg("完成所有标签更新，<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
     exit;
 }
 $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;");
@@ -75,7 +75,7 @@ if (is_array($tag) && count($tag) > 0) {
         $dlist->MakeHtml(1, 10);
         $reurl = '..'.$tagsdir;
         if ($upall == 1) {
-            ShowMsg("完成所有标签更新，<a href='$reurl' target='_blank'>浏览标签页</a>", "javascript:;");
+            ShowMsg("完成所有标签更新，<a href='$reurl' target='_blank'>浏览标签</a>", "javascript:;");
         } else {
             $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' ";
             $dsql->ExecuteNoneQuery($query);
@@ -93,12 +93,12 @@ if (is_array($tag) && count($tag) > 0) {
                 $nextpage = 0;
             }
             $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime";
-            ShowMsg("更新标签<span class='text-primary'>".$tag['tag']."</span>，继续执行任务", $gourl, 0, 100);
+            ShowMsg("更新标签<span class='text-primary'>".$tag['tag']."</span>，继续更新标签", $gourl, 0, 100);
             exit();
         } else {
             //继续当前这个
             $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime";
-            ShowMsg("更新标签<span class='text-primary'>".$tag['tag']."</span>，继续执行任务", $gourl, 0, 100);
+            ShowMsg("更新标签<span class='text-primary'>".$tag['tag']."</span>，继续更新标签", $gourl, 0, 100);
             exit();
         }
     }

src/admin/sys_cache_up.php

@@ -23,7 +23,7 @@ if ($dopost == "ok") {
     else if ($step == 1) {
         UpDateCatCache();
         ClearOptCache();
-        ShowMsg("正在清理栏目缓存，下一步清理枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc");
+        ShowMsg("正在清理栏目缓存，继续清理枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc");
         exit();
     }
     //更新枚举缓存
@@ -31,7 +31,7 @@ if ($dopost == "ok") {
         include_once(DEDEINC."/enums.func.php");
         WriteEnumsCache();
         //WriteAreaCache(); 已过期
-        ShowMsg("正在清理枚举缓存，下一步清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc");
+        ShowMsg("正在清理枚举缓存，继续清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc");
         exit();
     }
     //清理arclist调用缓存、过期会员浏览历史、过期短信、陈旧的流量统计数据
@@ -39,10 +39,10 @@ if ($dopost == "ok") {
         echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$cfg_soft_lang\">";
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`");
         $msg = array();
-        $msg[] = "正在清理arclist调用缓存，下一步清理过期会员浏览历史";
+        $msg[] = "正在清理arclist调用缓存，继续清理过期会员浏览历史";
         $oldtime = time() - (90 * 24 * 3600);
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' ");
-        $msg[] = "正在清理过期短信，下一步修正错误文档，可能要占较长时间";
+        $msg[] = "正在清理过期短信，继续修正错误文档，可能要占较长时间";
         $limit = date('Ymd', strtotime('-15 days'));
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__statistics_detail` WHERE created_date < '$limit'");
         $msg[] = "正在清理15天之前流量统计";

src/admin/task_do.php

@@ -61,7 +61,7 @@ if ($dopost == 'makeprenext') {
         exit();
     } else {
         $jumpurl = GetNextUrl();
-        ShowMsg("完成下篇文档更新任务，继续执行其它任务", $jumpurl, 0, 500);
+        ShowMsg("完成下篇文档更新任务，继续更新其它任务", $jumpurl, 0, 500);
         exit();
     }
 }
@@ -125,7 +125,7 @@ else if ($dopost == 'makeparenttype') {
         if (!empty($doposttmp)) {
             $jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl);
             $jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}";
-            ShowMsg("完成栏目：{$tid}更新，继续执行后续任务", $jumpurl, 0, 500);
+            ShowMsg("完成栏目：{$tid}更新，继续更新后续任务", $jumpurl, 0, 500);
             exit();
         } else {
             ShowMsg("完成栏目：{$tid}更新，完成所有更新任务", "close::tgtable");

src/admin/templets/album_add.htm

@@ -27,7 +27,7 @@
 			<input type="hidden" name="cid" value="<?php echo $cid;?>">
 			<input type="hidden" name="imagebody" value="">
 			<input type="hidden" name="dopost" value="save">
-			<input type="hidden" name="maxwidth" id="maxwidth" size="10" value="<?php echo $cfg_album_width;?>">
+			<input type="hidden" name="maxwidth" id="maxwidth" value="<?php echo $cfg_album_width;?>">
 			<input type="hidden" id="albums" name="albums" value="">
 			<table width="98%" align="center" cellpadding="2" cellspacing="2" id="needset" class="admin-border my-3">
 				<tr bgcolor="#f5f5f5">

src/admin/templets/member_pmall.htm

@@ -24,34 +24,28 @@
 				</tr>
 			</table>
 		</form>
-		<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
-			<tr>
-				<td bgcolor="#f5f5f5" colspan="7">
-					<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-					<span id="cate_1" class="btn btn-success btn-sm">群发短信</span>
-					<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="7">
-					<form id="postall" method="post" action="member_pmall.php">
-						<input type="hidden" name="action" value="post">
-						<table width="100%" cellpadding="1" cellspacing="1">
-							<tr>
-								<td width="260">标题：</td>
-								<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
-							</tr>
-							<tr>
-								<td><label for="pm_textarea">文档：</label></td>
-								<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
-							</tr>
-							<tr>
-								<td colspan="2" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>
-							</tr>
-						</table>
-					</form>
-				</td>
-			</tr>
-		</table>
+		<form id="postall" method="post" action="member_pmall.php">
+			<input type="hidden" name="action" value="post">
+			<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
+				<tr>
+					<td bgcolor="#f5f5f5" colspan="2">
+						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+						<span id="cate_1" class="btn btn-success btn-sm">群发短信</span>
+						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
+					</td>
+				</tr>
+				<tr>
+					<td width="260">标题：</td>
+					<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
+				</tr>
+				<tr>
+					<td><label for="pm_textarea">文档：</label></td>
+					<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
+				</tr>
+				<tr>
+					<td colspan="2" bgcolor="#f5f5f5" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>
+				</tr>
+			</table>
+		</form>
 	</body>
 </html>

src/admin/templets/member_pmone.htm

@@ -24,38 +24,32 @@
 				</tr>
 			</table>
 		</form>
-		<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
-			<tr>
-				<td bgcolor="#f5f5f5" colspan="7">
-					<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-					<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
-					<span id="cate_1" class="btn btn-success btn-sm">单独短信</span>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="7">
-					<form id="postall" method="post" action="member_pmone.php">
-						<input type="hidden" name="action" value="post">
-						<table width="100%" cellpadding="1" cellspacing="1">
-							<tr>
-								<td width="260">发送到：</td>
-								<td><input type="text" name="msgtoid" value="<?php echo empty($touid)? '' : $touid?>" class="admin-input-lg"> 填写会员登录的id（网址uid=后面跟着的id）</td>
-							</tr>
-							<tr>
-								<td>标题：</td>
-								<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
-							</tr>
-							<tr>
-								<td><label for="pm_textarea">文档：</label></td>
-								<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
-							</tr>
-							<tr>
-								<td colspan="2" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>
-							</tr>
-						</table>
-					</form>
-				</td>
-			</tr>
-		</table>
+		<form id="postall" method="post" action="member_pmone.php">
+			<input type="hidden" name="action" value="post">
+			<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
+				<tr>
+					<td bgcolor="#f5f5f5" colspan="2">
+						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
+						<span id="cate_1" class="btn btn-success btn-sm">单独短信</span>
+					</td>
+				</tr>
+				<tr>
+					<td width="260">发送到：</td>
+					<td><input type="text" name="msgtoid" value="<?php echo empty($touid)? '' : $touid?>" class="admin-input-lg"> 填写会员登录的id（网址uid=后面跟着的id）</td>
+				</tr>
+				<tr>
+					<td>标题：</td>
+					<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
+				</tr>
+				<tr>
+					<td><label for="pm_textarea">文档：</label></td>
+					<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
+				</tr>
+				<tr>
+					<td colspan="2" bgcolor="#f5f5f5" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>
+				</tr>
+			</table>
+		</form>
 	</body>
 </html>

src/admin/templets/sys_info.htm

@@ -35,7 +35,7 @@
 				</td>
 			</tr>
 			<tr id="addvar" style="display:none">
-				<td colspan="2">
+				<td colspan="2" class="p-0">
 					<form name="fadd" action="sys_info.php" method="post">
 						<input type="hidden" name="dopost" value="add">
 						<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
@@ -144,15 +144,17 @@
 						<td><?php echo $row['varname']?></td>
 					</tr>
 					<?php }?>
-					<tr>
-						<td bgcolor="#f5f5f5" align="center" colspan="3">
-							<button type="submit" class="btn btn-success btn-sm">保存</button>
-							<button type="button" class="btn btn-outline-success btn-sm" onclick="document.form1.reset()">重置</button>
-						</td>
-					</tr>
 				</table>
 				<?php }?>
 			</div>
+			<table cellspacing="1" cellpadding="1" align="center" class="table maintable mb-3">
+				<tr>
+					<td bgcolor="#f5f5f5" align="center" colspan="3">
+						<button type="submit" class="btn btn-success btn-sm">保存</button>
+						<button type="button" class="btn btn-outline-success btn-sm" onclick="document.form1.reset()">重置</button>
+					</td>
+				</tr>
+			</table>
 		</form>
 		<script>
 			var searchconfig = false;

src/admin/templets/sys_info_mark.htm

@@ -93,7 +93,7 @@
 					<td>水印位置：</td>
 					<td>
 						<label><input type="radio" name="get_photo_waterpos" value="0" <?php if ($photo_waterpos==0) echo ' checked';?>> 随机位置</label>
-						<table cellspacing="0" cellpadding="0" class="w-25 mt-2">
+						<table cellspacing="0" cellpadding="0" class="table-borderless w-25">
 							<tr>
 								<td width="33%">
 									<label><input type="radio" name="get_photo_waterpos" value="1" <?php if ($photo_waterpos==1) echo ' checked';?>> 顶部居左</label>

src/install/install.html

@@ -11,7 +11,7 @@
 		<script src="../static/web/js/popper.min.js"></script>
 		<script src="../static/web/js/bootstrap.min.js"></script>
 		<script src="../static/web/js/style.js"></script>
-		<style>body{line-height:1.6;letter-spacing:.6px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2,legend{line-height:1.6;font-size:18px;font-weight:600;color:#393d49}label{margin-bottom:10px;line-height:18px}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:800px}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}.logo,.form-control{height:36px}.form-control,.btn-md,.card,.alert,.rounded{border-radius:.5rem!important}.card-header:first-child{border-radius:.5rem .5rem 0 0}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
+		<style>body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2,legend{line-height:1.6;font-size:18px;font-weight:600;color:#393d49}label{margin-bottom:10px;line-height:18px}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:800px}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}.logo,.form-control{height:36px}.form-control,.btn-md,.card,.alert,.rounded{border-radius:.5rem!important}.card-header:first-child{border-radius:.5rem .5rem 0 0}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
 	</head>
 	<body>
 		<div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-3">

src/static/ckeditor/contents.css

@@ -1,8 +1,8 @@
 body {
 	line-height:1.6;
 	letter-spacing:.6px;
-	font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
 	font-size:14px;
+	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62;
 	background-color:#fff
 }

src/static/web/css/admin.css

@@ -10,14 +10,28 @@
 	background:#dee2e6;
 	border-radius:.5rem
 }
+::-moz-scrollbar {
+	width:6px;
+	height:6px
+}
+::-moz-scrollbar-track {
+	background:#f5f5f5;
+	border-radius:.5rem
+}
+::-moz-scrollbar-thumb {
+	background:#dee2e6;
+	border-radius:.5rem
+}
 * {
-	font-size:12px
+	font-size:12px;
+	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif
 }
 body {
 	margin:0;
 	line-height:1.6;
 	letter-spacing:.6px;
-	font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
+	font-size:12px;
+	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62;
 	background:#fff
 }

src/static/web/css/style.css

@@ -10,10 +10,23 @@
 	background:#dee2e6;
 	border-radius:.5rem
 }
+::-moz-scrollbar {
+	width:6px;
+	height:6px
+}
+::-moz-scrollbar-track {
+	background:#f5f5f5;
+	border-radius:.5rem
+}
+::-moz-scrollbar-thumb {
+	background:#dee2e6;
+	border-radius:.5rem
+}
 body {
 	line-height:1.6;
 	letter-spacing:.6px;
-	font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
+	font-size:14px;
+	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62
 }
 a {

src/user/api.php

@@ -98,10 +98,8 @@ if ($action === 'is_need_check_code') {
         ));
         exit;
     }
-
     $uploadedFile = $_FILES['file']['tmp_name'];
     $fileType = mime_content_type($uploadedFile);
-    
     if (!in_array($fileType, $allowedTypes)) {
         echo json_encode(array(
             "code" => -1,
@@ -127,7 +125,6 @@ if ($action === 'is_need_check_code') {
         $width = $imgSize[0];
         $height = $imgSize[1];
     }
-
     if (!is_dir($cfg_basedir.$cfg_user_dir."/{$cfg_ml->M_ID}")) {
         MkdirAll($cfg_basedir.$cfg_user_dir."/{$cfg_ml->M_ID}", $cfg_dir_purview);
         CloseFtp();

src/user/templets/album_edit.htm

@@ -126,9 +126,9 @@
 			</div>
 		</main>
 		<?php pasterTempletDiy('foot.htm');?>
-		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 		<script>
 			startNum = <?php echo $j;?>;
 		</script>
+		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>
 </html>

src/user/templets/edit_baseinfo.htm

@@ -26,7 +26,7 @@
 							<input type="hidden" id="newface" name="newface" value="">
 							<div class="form-group row">
 								<div class="col-sm-12">
-									<div class="alert alert-info mb-0">会员资料修改需验证原登录密码才能修改</div>
+									<div class="alert alert-info mb-0">会员资料修改需要验证密码才能修改</div>
 								</div>
 							</div>
 							<div class="form-group row">
@@ -46,8 +46,8 @@
 								</div>
 							</div>
 							<div class="form-group row">
-								<label for="iptOldpwd" class="col-sm-3 col-form-label">原登录密码：</label>
-								<div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75" placeholder="请输入原登录密码"></div>
+								<label for="iptOldpwd" class="col-sm-3 col-form-label">密码：</label>
+								<div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75" placeholder="请输入密码"></div>
 							</div>
 							<div class="form-group row">
 								<label for="iptUserpwd" class="col-sm-3 col-form-label">新密码：</label>
@@ -102,7 +102,7 @@
 			function checkSubmit() {
 				if (document.form2.oldpwd.value == '') {
 					document.form2.oldpwd.focus();
-					ShowMsg("请您填写原登录密码");
+					ShowMsg("请您填写密码");
 					return false;
 				}
 				if (document.form2.userpwdok.value != document.form2.userpwd.value) {
@@ -120,11 +120,13 @@
 					ShowMsg("请您填写昵称");
 					return false;
 				}
-			};
+			}
+		</script>
+		<script>
 			$(document).ready(function () {
 				$("#btnChangeEmail").click(function () {
 					if ($("#iptOldpwd").val() === "") {
-						ShowMsg("请您填写原登录密码");
+						ShowMsg("请您填写密码");
 						return false;
 					}
 					$.post("<?php echo $cfg_cmsurl;?>/user/api.php?action=get_old_email", { oldpwd: $("#iptOldpwd").val() }, function (result) {
@@ -137,7 +139,7 @@
 						}
 					});
 				})
-				$("#btnChangeFace").click(function(){
+				$("#btnChangeFace").click(function () {
 					$("#iptNewface").click();
 				})
 				$("#iptNewface").change(function (val) {