From cc04ad984b44b74efb5e44d186b26e54baa807bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E6=81=92?= <2323333339@qq.com>
Date: Tue, 2 Mar 2021 09:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/function.php  | 2 +-
 public/aside.php   | 7 -------
 public/include.php | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/function.php b/core/function.php
index dad91bb..02c3d25 100644
--- a/core/function.php
+++ b/core/function.php
@@ -3,7 +3,7 @@
 /* 获取主题当前版本号 */
 function _getVersion()
 {
-	return "5.4.9";
+	return "5.5.0";
 };
 
 /* 判断是否是手机 */
diff --git a/public/aside.php b/public/aside.php
index d2cbd8e..03b73e8 100644
--- a/public/aside.php
+++ b/public/aside.php
@@ -1,5 +1,4 @@
 <aside class="joe_aside">
-
     <section class="joe_aside__item author">
         <img width="100%" height="120" class="image lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="<?php $this->options->JAside_Author_Image() ?>" onerror="javascript: this.src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';" alt="博主栏壁纸" />
         <div class="user">
@@ -22,7 +21,6 @@
             <ul class="list"><?php _getAsideAuthorNav() ?></ul>
         <?php endif; ?>
     </section>
-
     <?php if ($this->options->JAside_Timelife_Status === 'on') : ?>
         <section class="joe_aside__item timelife">
             <div class="joe_aside__item-title">
@@ -36,7 +34,6 @@
             <div class="joe_aside__item-contain"></div>
         </section>
     <?php endif; ?>
-
     <?php if ($this->options->JAside_Hot_Num && $this->options->JAside_Hot_Num !== 'off') : ?>
         <section class="joe_aside__item hot">
             <div class="joe_aside__item-title">
@@ -70,7 +67,6 @@
             </ol>
         </section>
     <?php endif; ?>
-
     <?php if ($this->options->JAside_Newreply_Status === 'on') : ?>
         <section class="joe_aside__item newreply">
             <div class="joe_aside__item-title">
@@ -106,7 +102,6 @@
             </ul>
         </section>
     <?php endif; ?>
-
     <?php if ($this->options->JAside_Ranking && $this->options->JAside_Ranking !== 'off') : ?>
         <section class="joe_aside__item ranking">
             <div class="joe_aside__item-title">
@@ -122,7 +117,6 @@
             </ul>
         </section>
     <?php endif; ?>
-
     <?php if ($this->options->JAside_Weather_Key) : ?>
         <section class="joe_aside__item weather" data-key="<?php $this->options->JAside_Weather_Key() ?>" data-style="<?php $this->options->JAside_Weather_Style() ?>">
             <div class="joe_aside__item-title">
@@ -138,5 +132,4 @@
             </div>
         </section>
     <?php endif; ?>
-
 </aside>
\ No newline at end of file
diff --git a/public/include.php b/public/include.php
index 102d70c..f105349 100644
--- a/public/include.php
+++ b/public/include.php
@@ -21,7 +21,7 @@
 <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.css?update=20210301'); ?>">
 <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.css?update=20210301'); ?>">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.css" />
-<?php if ($this->options->JAside && in_array('weather', $this->options->JAside) && $this->options->JAside_Weather_Key) : ?>
+<?php if ($this->options->JAside_Weather_Key) : ?>
 	<link rel="stylesheet" href="https://apip.weatherdt.com/standard/static/css/weather-standard.css">
 <?php endif; ?>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />