Merge pull request #10 from gogobody/dev

bugs fix
gogobody · Jun 1, 2021 · 58adfad · 58adfad
2 parents e411785 + f1eb305
commit 58adfad
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 10 deletions.
diff --git a/assets/js/onecircle.js b/assets/js/onecircle.js
@@ -1206,11 +1206,11 @@ var oneMap = { // use js only!
                         oneMap.init(AMap)
                     }).catch(function (e) {
                         console.error(e);  //加载错误提示
-                        $.message({
-                            type: "error",
-                            title: "提示",
-                            message: "获取amapJsKey失败"
-                        })
+                        // $.message({
+                        //     type: "error",
+                        //     title: "提示",
+                        //     message: "获取amapJsKey失败"
+                        // })
                     });
                 } else {
                     console.log(json)

diff --git a/assets/js/onecircle.min.js b/assets/js/onecircle.min.js
diff --git a/includes/footer.php b/includes/footer.php
@@ -30,7 +30,7 @@
 <!-- 鼠标点击特效 -->
 <?php $this->need('blog/config/cursor.effect.php'); ?>
 
-<?php Typecho_Plugin::factory('SmmsPlugin')->footer($this); ?>
+<?php Typecho_Plugin::factory('SmmsForTypecho')->footer($this); ?>
 <?php
     $userId = -1; //save userid
     if ($this->user->hasLogin()){

diff --git a/includes/header.php b/includes/header.php
@@ -1,4 +1,8 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $all = Typecho_Plugin::export();?>
+<?php if (!array_key_exists('SmmsForTypecho', $all['activated']) or !array_key_exists('OneCircle', $all['activated'])) : ?>
+    <?php die("请下载并开启 SmmsPlugin 插件 和 onecircle 配套插件，查看：<a href='https://www.yuque.com/docs/share/05f40cac-980f-4e53-8b92-ed9728b8dc50?#%E3%80%8AOneCircle%20%E4%B8%BB%E9%A2%98%E8%AF%B4%E6%98%8E%E3%80%8B'>使用说明</a>"); ?>
+<?php endif; ?>
 <!DOCTYPE html>
 <html lang="zh-cn">
 <head>
@@ -84,7 +88,8 @@
             background-image: url("<?php echo $this->options->bgImg ? $this->options->bgImg :''?>");
         }
     </style>
-    <?php Typecho_Plugin::factory('SmmsPlugin')->header($this);?>
+
+    <?php Typecho_Plugin::factory('SmmsForTypecho')->header($this);?>
 
 </head>
 <body class="bright" ontouchstart="">

diff --git a/index.php b/index.php
@@ -4,7 +4,7 @@
  * OneCircle theme，也许是 typecho 第一个社交圈子主题
  * @package OneCircle
  * @author gogobody <a href="https://www.ijkxs.com">即刻学术</a>
- * @version 3.05
+ * @version 3.06
  * @link check https://github.com/gogobody/onecircle
  */
 

diff --git a/libs/admin/core.php b/libs/admin/core.php
@@ -7,7 +7,7 @@
 /* 获取模板版本号 */
 function OnecircleVersion()
 {
-    return "3.05";
+    return "3.06";
 }
 
 /* 获取懒加载图片 */