From 1643269b0bb4bb5688256d29cbcbdb391d13fda5 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: Thu, 19 Oct 2023 14:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=BF=E5=91=8A=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/ad_edit.php        | 13 ++++---------
 src/static/web/css/admin.css |  6 +++---
 src/static/web/css/style.css |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php
index 0f84b573..a6f0ae1b 100644
--- a/src/admin/ad_edit.php
+++ b/src/admin/ad_edit.php
@@ -20,18 +20,13 @@ if ($dopost == 'delete') {
     exit();
 } else if ($dopost == "gettag") {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
-    $jscode = "<script src='{$cfg_phpurl}/ad_js.php?aid=$aid'></script>";
-    $showhtml = "<xmp>\r\n\r\n$jscode\r\n\r\n</xmp>";
-    $showhtml .= "<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='360'></iframe>";
     $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' ");
-    $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}';
-    $wecome_info = "<a href='ad_main.php'>广告管理</a> - 获取标签";
+    $tagcode = '{'."dede:myad name='{$row['tagname']}'/".'} <script src="{$cfg_phpurl}/ad_js.php?aid=$aid"></script>';
+    $showhtml = "<p>两种标签调用示例</p><xmp>$tagcode</xmp>";
+    $showhtml .= "<p>前台调用效果</p><iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='350'></iframe>";
+    $wecome_info = "<a href='ad_main.php'>广告管理</a> - 调用实例";
     $win = new OxWindow();
     $win->Init();
-    $win->AddTitle("标签调用代码");
-    $winform = $win->GetWindow("hand", $showtag);
-    $win->myWinItem = '';
-    $win->AddTitle("js调用代码");
     $winform = $win->GetWindow("hand", $showhtml);
     $win->Display();
     exit();
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 832cd3e2..36a46361 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -2,7 +2,7 @@
 ::-webkit-scrollbar-track{background:#f5f5f5}
 ::-webkit-scrollbar-thumb{background:#dee2e6}
 *{font-size:14px;scrollbar-width:thin}
-body{margin:0;line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#6c757d;background:#fff}
+body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#6c757d;background:#fff}
 a{color:#6c757d;text-decoration:none}
 a:hover{color:#007bff;text-decoration:none}
 img{max-width:100%;border-radius:0.5rem}
@@ -69,7 +69,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s}
 .body-right{position:absolute;top:60px;right:0;bottom:0}
 .body-right iframe{width:100%;height:99%;border:0}
 .web-info{padding:10px;background:#f5f5f5;text-overflow:ellipsis;white-space:nowrap}
-#_fileList,#_verList{height:360px;overflow-y:auto}
+#_fileList,#_verList{height:350px;overflow-y:auto}
 #_msgInfo{display:none}
 .update-close{background:#fff;border:0}
 .updates-dot{display:none;position:absolute;top:12px;right:6px;height:6px;width:6px;background:#dc3545;border-radius:50%}
@@ -125,7 +125,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s}
 .form-control{display:inline-block}
 .fa{font-size:14px!important;color:inherit}
 .admin-win{background:#f5f5f5;border:1px solid #dee2e6!important}
-.admin-win-iframe{width:100%;height:360px}
+.admin-win-iframe{width:100%;height:350px}
 .admin-main-sort{margin-left:1rem;padding:0;width:30px;text-align:center}
 .admin-td{padding:0.5rem;border-bottom:1px solid #dee2e6}
 .admin-textarea-xl{width:100%;height:90px}
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index 19236735..a5c172bd 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -2,7 +2,7 @@
 ::-webkit-scrollbar-track{background:#f5f5f5}
 ::-webkit-scrollbar-thumb{background:#dee2e6}
 *{scrollbar-width:thin}
-body{margin:0;line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#6c757d;background:#fff}
+body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#6c757d;background:#fff}
 a{color:#6c757d;text-decoration:none}
 a:hover{color:#007bff;text-decoration:none}
 img{max-width:100%;border-radius:0.5rem}