From 7655463722ac8502d72da4c3310bca441e0ed5d8 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 11 Nov 2019 20:53:22 +0800
Subject: [PATCH] =?UTF-8?q?thinkphp=E6=A1=86=E6=9E=B6=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 thinkphp/tpl/think_exception.tpl | 44 ++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/thinkphp/tpl/think_exception.tpl b/thinkphp/tpl/think_exception.tpl
index c637efbcf..dcc9a5034 100755
--- a/thinkphp/tpl/think_exception.tpl
+++ b/thinkphp/tpl/think_exception.tpl
@@ -88,7 +88,7 @@
             font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif;
             margin: 0;
             padding: 0 20px 20px;
-            text-align: center;
+            
         }
         h1{
             margin: 10px 0 0;
@@ -115,15 +115,12 @@
             text-decoration-style: dotted;
         }
         a{
-            color: #F44336;
+            color: #888;
             cursor: pointer;
             text-decoration: none;
-            padding: 10px 15px;
-            border: 1px solid #F44336;
         }
         a:hover{
-            background: #F44336;
-            color: #fff;
+            text-decoration: underline;
         }
         .line-error{
             background: #f8cbcb;
@@ -151,7 +148,7 @@
     
         /* Exception Info */
         .exception {
-            margin-top: 10%;
+            margin-top: 20px;
         }
         .exception .message{
             padding: 12px;
@@ -263,11 +260,27 @@
         .exception-var table td pre{
             margin: 0;
         }
+        .exception .error-message h1 {
+            text-align: center;
+            margin-top: 10%;
+        }
 
         /* Copyright Info */
         .copyright{
             margin-top: 30px;
             padding: 12px 0;
+            text-align: center;
+        }
+        .copyright a{
+            color: #F44336;
+            cursor: pointer;
+            text-decoration: none;
+            padding: 10px 15px;
+            border: 1px solid #F44336;
+        }
+        .copyright a:hover{
+            background: #F44336;
+            color: #fff;
         }
 
         /* SPAN elements with the classes below are added by prettyprint. */
@@ -337,9 +350,7 @@
     </div>
     <?php } else { ?>
     <div class="exception">
-        
-            <div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
-        
+        <div class="info error-message"><h1><?php echo htmlentities($message); ?></h1></div>
     </div>
     <?php } ?>
     
@@ -413,9 +424,16 @@
     </div>
     <?php } ?>
 
-    <div class="copyright">
-        <a title="<?php echo implode('', ['S','h','o','p','X','O','企','业','级','免','费','开','源','商','城','系','统']); ?>" href="<?php echo implode('', ['h','t','t','p','s',':','/','/','a','s','k','.','s','h','o','p','x','o','.','n','e','t','/','q','u','e','s','t','i','o','n','/','7']); ?>" target="_blank"><?php echo implode('', ['查','看','解','决','方','案']); ?></a> 
-    </div>
+    <?php if(\think\facade\App::isDebug()) { ?>
+        <div class="copyright">
+            <a title="<?php echo implode('', ['S','h','o','p','X','O','企','业','级','免','费','开','源','商','城','系','统']); ?>" href="<?php echo implode('', ['h','t','t','p','s',':','/','/','s','h','o','p','x','o','.','n','e','t','/']); ?>" target="_blank"><?php echo implode('', ['S','h','o','p','X','O','企','业','级','免','费','开','源','商','城','系','统']); ?></a>
+        </div>
+    <?php } else { ?>
+        <div class="copyright">
+            <a title="<?php echo implode('', ['S','h','o','p','X','O','企','业','级','免','费','开','源','商','城','系','统']); ?>" href="<?php echo implode('', ['h','t','t','p','s',':','/','/','a','s','k','.','s','h','o','p','x','o','.','n','e','t','/','q','u','e','s','t','i','o','n','/','7']); ?>" target="_blank"><?php echo implode('', ['查','看','解','决','方','案']); ?></a>
+        </div>
+    <?php } ?>
+
     <?php if(\think\facade\App::isDebug()) { ?>
     <script>
         var LINE = <?php echo $line; ?>;
-- 
GitLab