调整

src/admin/search_keywords_main.php

@@ -70,9 +70,10 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
             <td scope='col'>选择</td>
             <td scope='col'><a href=\"javascript:ReloadPage('aid');\">id</a></td>
             <td scope='col'>关键词</td>
-            <td scope='col'>分词结果</td>
-            <td scope='col'><a href=\"javascript:ReloadPage('count');\">频率</a></td>
-            <td scope='col'><a href=\"javascript:ReloadPage('result');\">结果</a></td>
+            <td scope='col'>关键词调整</td>
+            <td scope='col'>分词调整</td>
+            <td scope='col'><a href=\"javascript:ReloadPage('count');\">频率调整</a></td>
+            <td scope='col'><a href=\"javascript:ReloadPage('result');\">索引</a></td>
             <td scope='col'><a href=\"javascript:ReloadPage('lasttime');\">搜索时间</a></td>
             <td scope='col'>操作</td>
         </tr>
@@ -87,10 +88,11 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
     <tr>
         <td><input name='aids[]' type='checkbox' value=\"{$row['aid']}\"></td>
         <td>{$row['aid']}</td>
+        <td><a href='{$cfg_phpurl}/search.php?keyword=".urlencode($row['keyword'])."' target='_blank'>{$row['keyword']}</a></td>
         <td><input type='text' name='keyword' id='keyword{$row['aid']}' value='{$row['keyword']}' class='admin-input-sm'></td>
         <td><input type='text' name='spwords' id='spwords{$row['aid']}' value='{$row['spwords']}' class='admin-input-md'></td>
         <td><input type='text' name='count' id='count{$row['aid']}' value='{$row['count']}' class='admin-input-sm'></td>
-        <td><a href='{$cfg_phpurl}/search.php?kwtype=0&keyword=".urlencode($row['keyword'])."&searchtype=titlekeyword' target='_blank'>{$row['result']}</a></td>
+        <td>{$row['result']}</td>
         <td>".MyDate("Y-m-d H:i:s", $row['lasttime'])."</td>
         <td>
             <a href='javascript:UpdateNote({$row['aid']});' class='btn btn-light btn-sm'><i class='fa fa-repeat' title='更新'></i></a>
@@ -100,7 +102,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
         echo $line;
     }
     echo "<tr>
-            <td colspan='8'>
+            <td colspan='9'>
             <a href=\"javascript:selAll();\" class='btn btn-success btn-sm'>反选</a>
             <a href=\"javascript:noselAll();\" class='btn btn-success btn-sm'>取消</a>
             <a href=\"javascript:delall();\" class='btn btn-danger btn-sm'>删除</a>

src/admin/templets/makehtml_tag_list.htm

@@ -12,10 +12,10 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item active">更新专题</li>
+				<li class="breadcrumb-item active">更新标签</li>
 			</ol>
 			<div class="card shadow-sm">
-				<div class="card-header">更新专题</div>
+				<div class="card-header">更新标签</div>
 				<div class="card-body">
 					<div class="alert alert-info">更新静态文件后浏览动态链接会自动跳转至静态链接，需要动态浏览则删除对应静态文件。标签首页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag.htm，标签文档列表模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag_list.htm</div>
 					<form name="form1" action="makehtml_tag_action_list.php" method="get" target="stafrm">

src/admin/templets/sys_payment.htm

@@ -20,19 +20,29 @@
 			<div class="card shadow-sm mb-3">
 				<div class="card-header">支付接口设置</div>
 				<div class="card-body">
-					<ul class="nav nav-tabs" id="myTab" role="tablist">
-						<li class="nav-item" role="presentation"><button type="button" id="wechat-tab" class="nav-link active" data-toggle="tab"	data-target="#wechat" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button></li>
-						<li class="nav-item" role="presentation"><button type="button" id="alipay-tab" class="nav-link" data-toggle="tab" data-target="#alipay" role="tab" aria-controls="alipay" aria-selected="false">支付宝</button></li>
-						<li class="nav-item" role="presentation"><button type="button" id="bank-tab" class="nav-link" data-toggle="tab" data-target="#bank" role="tab" aria-controls="bank" aria-selected="false">银行转帐</button></li>
-						<li class="nav-item" role="presentation"><button type="button" id="balance-tab" class="nav-link" data-toggle="tab" data-target="#balance" role="tab" aria-controls="balance" aria-selected="false">积分支付</button></li>
-						<li class="nav-item" role="presentation"><button type="button" id="cod-tab" class="nav-link" data-toggle="tab" data-target="#cod" role="tab" aria-controls="cod" aria-selected="false">货到付款</button></li>
+					<ul class="nav nav-pills mb-3" id="pay-tab" role="tablist">
+						<li class="nav-item" role="presentation">
+							<button type="button" id="wechat-tab" class="nav-link active" data-toggle="tab" data-target="#wechat" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button>
+						</li>
+						<li class="nav-item" role="presentation">
+							<button type="button" id="alipay-tab" class="nav-link" data-toggle="tab" data-target="#alipay" role="tab" aria-controls="alipay" aria-selected="false">支付宝</button>
+						</li>
+						<li class="nav-item" role="presentation">
+							<button type="button" id="bank-tab" class="nav-link" data-toggle="tab" data-target="#bank" role="tab" aria-controls="bank" aria-selected="false">银行转帐</button>
+						</li>
+						<li class="nav-item" role="presentation">
+							<button type="button" id="balance-tab" class="nav-link" data-toggle="tab" data-target="#balance" role="tab" aria-controls="balance" aria-selected="false">积分支付</button>
+						</li>
+						<li class="nav-item" role="presentation">
+							<button type="button" id="cod-tab" class="nav-link" data-toggle="tab" data-target="#cod" role="tab" aria-controls="cod" aria-selected="false">货到付款</button>
+						</li>
 					</ul>
-					<div class="tab-content pt-3" id="myTabContent">
+					<div class="tab-content" id="pay-tabContent">
 						<div class="tab-pane fade show active" id="wechat" role="tabpanel" aria-labelledby="wechat-tab">
 							<form>
-								<div class="form-group form-check">
-									<input type="checkbox" id="iptWechatEnabled" class="form-check-input">
-									<label class="form-check-label ml-2" for="iptWechatEnabled">是否启用</label>
+								<div class="form-group">
+									<input type="checkbox" id="iptWechatEnabled">
+									<label for="iptWechatEnabled">是否启用</label>
 								</div>
 								<div class="form-group">
 									<label for="iptWechatAppID">AppID</label>
@@ -54,9 +64,9 @@
 						</div>
 						<div class="tab-pane fade" id="alipay" role="tabpanel" aria-labelledby="alipay-tab">
 							<form>
-								<div class="form-group form-check">
-									<input type="checkbox" id="iptAlipayEnabled" class="form-check-input">
-									<label class="form-check-label ml-2" for="iptAlipayEnabled">是否启用</label>
+								<div class="form-group">
+									<input type="checkbox" id="iptAlipayEnabled">
+									<label for="iptAlipayEnabled">是否启用</label>
 								</div>
 								<div class="form-group">
 									<label for="iptAlipayAPPID">APPID</label>
@@ -82,9 +92,9 @@
 						</div>
 						<div class="tab-pane fade" id="bank" role="tabpanel" aria-labelledby="bank-tab">
 							<form>
-								<div class="form-group form-check">
-									<input type="checkbox" id="iptBankEnabled" class="form-check-input">
-									<label class="form-check-label ml-2" for="iptBankEnabled">是否启用</label>
+								<div class="form-group">
+									<input type="checkbox" id="iptBankEnabled">
+									<label for="iptBankEnabled">是否启用</label>
 									<span>（会员支付到指定银行卡，手动确认订单收款）</span>
 								</div>
 								<div class="form-group">
@@ -107,9 +117,9 @@
 						</div>
 						<div class="tab-pane fade" id="balance" role="tabpanel" aria-labelledby="balance-tab">
 							<form>
-								<div class="form-group form-check">
-									<input type="checkbox" id="iptBalanceEnabled" class="form-check-input">
-									<label class="form-check-label ml-2" for="iptBalanceEnabled">是否启用</label>
+								<div class="form-group">
+									<input type="checkbox" id="iptBalanceEnabled">
+									<label for="iptBalanceEnabled">是否启用</label>
 									<span>（采用积分进行支付）</span>
 								</div>
 								<div class="form-group">
@@ -120,9 +130,9 @@
 						</div>
 						<div class="tab-pane fade" id="cod" role="tabpanel" aria-labelledby="cod-tab">
 							<form>
-								<div class="form-group form-check">
-									<input type="checkbox" id="iptCodEnabled" class="form-check-input">
-									<label class="form-check-label ml-2" for="iptCodEnabled">是否启用</label>
+								<div class="form-group">
+									<input type="checkbox" id="iptCodEnabled">
+									<label for="iptCodEnabled">是否启用</label>
 									<span>（购买直接发货，到货后支付）</span>
 								</div>
 								<div class="form-group">
@@ -244,9 +254,9 @@
 				dataType: "json",
 				success: function(data) {
 					if (data.code === 0) {
-						ShowMsg("保存支付配置成功");
+						ShowMsg("保存支付接口设置成功");
 					} else {
-						ShowMsg("保存失败");
+						ShowMsg("保存支付接口设置失败");
 					}
 				}
 			})

src/admin/templets/tags_main.htm

@@ -117,16 +117,16 @@
 						<div class="col-sm-9"><input type="text" name="title" class="form-control" disabled value="${tag}"></div>
 					</div>
 					<div class="form-group row">
-						<label for="iptKw" class="col-sm-3 col-form-label">标题</label>
-						<div class="col-sm-9"><input type="text" name="title" id="iptTitle" class="form-control" placeholder="例如：DedeBIZ管理系统" value="${title}"></div>
+						<label for="iptKw" class="col-sm-3 col-form-label">SEO标题</label>
+						<div class="col-sm-9"><input type="text" name="title" id="iptTitle" class="form-control" value="${title}"></div>
 					</div>
 					<div class="form-group row">
 						<label for="iptKw" class="col-sm-3 col-form-label">关键词</label>
-						<div class="col-sm-9"><input type="text" name="kw" id="iptKw" class="form-control" placeholder="例如：dedebiz" value="${keywords}"></div>
+						<div class="col-sm-9"><input type="text" name="kw" id="iptKw" class="form-control" value="${keywords}"></div>
 					</div>
 					<div class="form-group row">
 						<label for="iptDes" class="col-sm-3 col-form-label">描述</label>
-						<div class="col-sm-9"><textarea name="des" id="iptDes" class="form-control" placeholder="例如：DedeBIZ系统基于PHP7版本开发，具有很强的可扩展性，并且采用GPLv2协议完全开放源代码。">${description}</textarea></div>
+						<div class="col-sm-9"><textarea name="des" id="iptDes" class="form-control">${description}</textarea></div>
 					</div>`, {
 						footer: `<button type="button" class="btn btn-success btn-sm" onclick="UpdateKwDesDo(${tid}, '~modalID~')">保存</button>`,
 					});

src/static/web/css/admin.css

@@ -67,7 +67,8 @@ input:focus,select:focus,textarea:focus {
 input[type=radio],input[type=checkbox],input[type=radio]:focus,input[type=checkbox]:focus {
 	width:14px;
 	height:14px;
-	box-shadow:none
+	box-shadow:none;
+	vertical-align:middle
 }
 select {
 	padding:0.25rem 0.5rem;
@@ -648,7 +649,7 @@ body.menu-show .admin-content {
 }
 .admin-textarea-xl {
 	width:100%;
-	height:90px
+	height:90px!important
 }
 .admin-textarea-sm {
 	width:350px;
@@ -716,7 +717,7 @@ span.page-link {
 	color:var(--white);
 	background:var(--green)
 }
-input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.card,.form-control,.btn,.alert,.rounded {
+input,select,textarea,button,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.alert,.card,.rounded,.form-control,.btn {
 	border-radius:var(--b-radius)!important
 }
 .cke_top {
@@ -733,7 +734,10 @@ input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywrite
 	border-top-right-radius:0!important;
 	border-bottom-right-radius:0!important
 }
-.btn-sm {
+.nav-pills .nav-link.active,.nav-pills .show>.nav-link {
+	background:var(--green)
+}
+.nav-pills .nav-link,.btn-sm {
 	padding:0 0.5rem;
 	height:30px;
 	line-height:30px;

src/system/taglib/tag.lib.php

@@ -53,9 +53,9 @@ function lib_tag(&$ctag, &$refObj)
         $row['keyword'] = $row['tag'];
         $row['tag'] = dede_htmlspecialchars($row['tag']);
         if (isset($envs['makeTag']) && $envs['makeTag'] == 1 || $ishtml == 1) {
-            $row['link'] = $cfg_cmsurl.$tagsdir."/".$row['id']."/";
+            $row['link'] = $cfg_cmsurl.$tagsdir."/".$row['id']."";
         } else {
-            $row['link'] = $cfg_cmsurl."/apps/tags.php?/".$row['id']."/";
+            $row['link'] = $cfg_cmsurl."/apps/tags.php?".$row['id']."";
         }
         $row['highlight'] = mt_rand(1, 10);
         foreach ($ctp->CTags as $tagid => $ctag) {