From d4310700b468b0939a1aeb43966a187880a5f1ea Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Tue, 15 Dec 2020 22:36:58 +0800
Subject: [PATCH] fix BUG

---
 config.simple.php               |   2 ++
 db/onenav.simple.db3            | Bin 32768 -> 32768 bytes
 templates/admin/static/embed.js |  11 ++++++++---
 templates/default/index.php     |   2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config.simple.php b/config.simple.php
index 81180e4..aec4111 100644
--- a/config.simple.php
+++ b/config.simple.php
@@ -25,6 +25,8 @@ $site_setting['password']       =   PASSWORD;
 
 //站点标题
 $site_setting['title']          =   'OneNav';
+//文字Logo
+$site_setting['logo']          =   'OneNav';
 //站点关键词
 $site_setting['keywords']       =   'OneNav,简洁导航,云链接,个人书签';
 //站点描述
diff --git a/db/onenav.simple.db3 b/db/onenav.simple.db3
index 248afccb299f3e5334596c0b6cbaf7daddd67864..bda06b0362e93f21e2e3a362d1bea3017471f147 100644
GIT binary patch
literal 32768
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
ShgW`<eXOd@j;p_LdEjp<xP__!

delta 73
zcmZo@U}|V!njp=XG*QNxHHksb`s2owYJEnb%@6cd1eh2EHZuzR;%DPx00Ibmk^>7i
FVF2Gy5&8fC

diff --git a/templates/admin/static/embed.js b/templates/admin/static/embed.js
index f154efb..783f1e4 100644
--- a/templates/admin/static/embed.js
+++ b/templates/admin/static/embed.js
@@ -283,12 +283,17 @@ layui.use(['element','table','layer','form'], function(){
 
 function get_link_info() {
     var url = $("#url").val();
+    var index = layer.load(1);
     $.post('/index.php?c=api&method=get_link_info',{url:url},function(data,status){
-      var index = layer.load(1);
       //如果添加成功
       if(data.code == 0) {
-        $("#title").val(data.data.title);
-        $("#description").val(data.data.description);
+        if(data.data.title != null) {
+          $("#title").val(data.data.title);
+        }
+        if(data.data.description != null) {
+          $("#description").val(data.data.description);
+        }
+        
         layer.close(index);
       }
       else{
diff --git a/templates/default/index.php b/templates/default/index.php
index 1345448..cd25323 100644
--- a/templates/default/index.php
+++ b/templates/default/index.php
@@ -39,7 +39,7 @@
                     <div class="logo">
                         <a href="/" class="logo-expanded">
                             <!-- <img src="templates/default/assets/images/logo@2x.png" width="100%" alt="" /> -->
-                            <h1 style = "color:#0099FF;">OneNav</h1>
+                            <h1 style = "color:#0099FF;"><?php echo $site_setting['logo']; ?></h1>
                         </a>
                         <a href="/" class="logo-collapsed">
                             <img src="templates/default/assets/images/logo-collapsed@2x.png" width="40" alt="" />