bug修复

2021-11-13 23:40:28 +08:00 · 2021-11-13 23:40:28 +08:00 · e1a71878d6
parent 32b52bc545
commit e1a71878d6
54 changed files with 13721 additions and 14487 deletions
--- a/app/admin/controller/AuthController.php
+++ b/app/admin/controller/AuthController.php
@ -3,7 +3,6 @@
 namespace app\admin\controller;

 use app\common\model\AdminAuth;
-use app\common\model\AdminRole;
 use think\facade\App;
 use think\facade\Lang;
 use think\facade\Session;
@ -49,12 +48,6 @@ abstract class AuthController extends SystemBasic
     */
    protected $noNeedLogin = [];

-    /**
-     * 无需鉴权的方法,但需要登录
-     * @var array
-     */
-    protected $noNeedRight = [];
-
    /**
     * 无需记录日志
     * @var array
@ -89,7 +82,7 @@ abstract class AuthController extends SystemBasic
     */
    protected function initialize()
    {
-        parent::initialize(); // TODO: Change the autogenerated stub
+        parent::initialize();
        $this->adminInfo = Session::get("adminInfo");
        $this->adminId = Session::get("adminId");
        $this->module = App::getInstance()->http->getName();
@ -97,7 +90,7 @@ abstract class AuthController extends SystemBasic
        $this->action = $this->request->action();
        $this->auth = explode(",", $this->adminInfo['role_auth']??'');
        $this->nowAuthId = AdminAuth::getAuthId($this->module,$this->controller,$this->action);
-        $this->model = $this->buildModel($this->module,$this->request->controller());
+        $this->model = $this->buildModel();
        // 鉴权
        $this->checkAuth();
        // 多语言
@ -154,14 +147,11 @@ abstract class AuthController extends SystemBasic

    /**
     * 生成model路径
-     * @param string $module
-     * @param string $controller
     * @return object|\think\App|null
     */
-    protected function buildModel(string $module, string $controller)
+    protected function buildModel()
    {
        $path = explode(".", $this->request->controller());
-//        $modelPath = "app\\{$this->module}\\model";
        $modelPath = "app\\common\\model"; //全部为common
        foreach ($path as $v) $modelPath .= "\\".$v;
        if (class_exists($modelPath)) return app($modelPath);
--- a/app/admin/controller/Category.php
+++ b/app/admin/controller/Category.php
@ -2,7 +2,7 @@

 namespace app\admin\controller;

-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\DocumentCategory as aModel;
 use app\common\model\DocumentCategoryContent;
 use app\Request;
@ -88,7 +88,7 @@ class Category extends AuthController
                $res =  DocumentCategoryContent::update(['content'=>$content],['id'=>$id]);
            }
        }
-        cache(Config::DATA_DOCUMENT_CATEGORY_LIST,null);
+        cache(Data::DATA_DOCUMENT_CATEGORY_LIST,null);
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }

@ -102,7 +102,7 @@ class Category extends AuthController
        if (!$id) return app("json")->fail("参数有误，Id为空！");
        $where = Util::postMore([['field',''],['value','']]);
        if ($where['field'] == '' || $where['value'] =='') return app("json")->fail("参数有误！");
-        cache(Config::DATA_DOCUMENT_CATEGORY_LIST,null);
+        cache(Data::DATA_DOCUMENT_CATEGORY_LIST,null);
        return aModel::update([$where['field']=>$where['value']],['id'=>$id]) ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }

@ -179,7 +179,7 @@ class Category extends AuthController
        $model = new aModel();
        $model->where('id',$where['id'])->delete();
        $res = DocumentCategoryContent::where('id',$where['id'])->delete();
-        cache(Config::DATA_DOCUMENT_CATEGORY_LIST,null);
+        cache(Data::DATA_DOCUMENT_CATEGORY_LIST,null);
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }
 }
--- a/app/admin/controller/FriendLink.php
+++ b/app/admin/controller/FriendLink.php
@ -2,7 +2,7 @@

 namespace app\admin\controller;

-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\FriendLink as aModel;
 use app\admin\service\FormBuilderService as Form;
 use app\Request;
@ -124,7 +124,7 @@ class FriendLink extends AuthController
            $data['uid'] = $this->adminId;
            $res = aModel::update($data,['id'=>$id]);
        }
-        cache(Config::DATA_FRIEND_LINK,null);//清除缓存
+        cache(Data::DATA_FRIEND_LINK,null);//清除缓存
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }

@ -140,7 +140,7 @@ class FriendLink extends AuthController
        if (!$id) return app("json")->fail("参数有误，Id为空！");
        $where = Util::postMore([['field',''],['value','']]);
        if ($where['field'] == '' || $where['value'] =='') return app("json")->fail("参数有误！");
-        cache(Config::DATA_FRIEND_LINK,null);//清除缓存
+        cache(Data::DATA_FRIEND_LINK,null);//清除缓存
        return aModel::update([$where['field']=>$where['value']],['id'=>$id]) ? app("json")->success("操作成功") : app("json")->fail("操作失败");
    }
 }
--- a/app/admin/controller/Invitation.php
+++ b/app/admin/controller/Invitation.php
@ -19,7 +19,7 @@ class Invitation extends AuthController
     */
    public function initialize()
    {
-        parent::initialize(); // TODO: Change the autogenerated stub
+        parent::initialize();
        //修正因为修改model名称和原来不能对应导致的model功能异常
        $this->model = new aModel();
    }
--- a/app/admin/controller/Message.php
+++ b/app/admin/controller/Message.php
@ -19,7 +19,7 @@ class Message extends AuthController
     */
    public function initialize()
    {
-        parent::initialize(); // TODO: Change the autogenerated stub
+        parent::initialize();
        //修正因为修改model名称和原来不能对应导致的model功能异常
        $this->model = new aModel();
    }
--- a/app/admin/controller/Poster.php
+++ b/app/admin/controller/Poster.php
@ -3,7 +3,7 @@
 namespace app\admin\controller;

 use app\admin\service\FormBuilderService as Form;
-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\Advert as aModel;
 use app\Request;
 use app\admin\service\UtilService as Util;
@ -23,7 +23,7 @@ class Poster extends AuthController
     */
    public function initialize()
    {
-        parent::initialize(); // TODO: Change the autogenerated stub
+        parent::initialize();
        //修正因为修改model名称和原来不能对应导致的model功能异常
        $this->model = new aModel();
    }
@ -145,7 +145,7 @@ class Poster extends AuthController
        }else {
            $res = aModel::update($data,['id'=>$id]);
        }
-        cache(Config::DATA_ADVERT.'_'.$data['type'],null);//清除缓存
+        cache(Data::DATA_ADVERT.'_'.$data['type'],null);//清除缓存
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }
 }
--- a/app/admin/controller/Slides.php
+++ b/app/admin/controller/Slides.php
@ -2,7 +2,7 @@

 namespace app\admin\controller;

-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\Slides as aModel;
 use app\admin\service\FormBuilderService as Form;
 use app\Request;
@ -121,7 +121,7 @@ class Slides extends AuthController
        }else {
            $res = aModel::update($data,['id'=>$id]);
        }
-        cache(Config::DATA_BANNER,null);//清除缓存
+        cache(Data::DATA_BANNER,null);//清除缓存
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }
 }
--- a/app/admin/controller/SystemConfig.php
+++ b/app/admin/controller/SystemConfig.php
@ -2,7 +2,7 @@

 namespace app\admin\controller;

-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\SystemConfig as cModel;
 use app\common\model\SystemConfigTab as tModel;
 use app\Request;
@ -185,7 +185,7 @@ class SystemConfig extends AuthController
            $res = cModel::update($data,['id'=>$id]);
        }
        //修改完需要更新缓存
-        cache(Config::DATA_SYSTEM_CONFIG,null);//清除缓存
+        cache(Data::DATA_SYSTEM_CONFIG,null);//清除缓存
        return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败");
    }

@ -198,7 +198,7 @@ class SystemConfig extends AuthController
    {
        try {
            foreach ($request->param() as $k => $v) cModel::editValueByFormName($k,$v);
-            cache(Config::DATA_SYSTEM_CONFIG,null);//清除缓存
+            cache(Data::DATA_SYSTEM_CONFIG,null);//清除缓存
            return app("json")->success("操作成功");
        }catch (\Exception $e)
        {
--- a/app/admin/view/category/index.html
+++ b/app/admin/view/category/index.html
@ -86,7 +86,7 @@
                title: '名称',
            },
            {
-                field: 'display',
+                field: 'status',
                title: '是否可见',
                formatter: function (value, row, index) {
                    if (value == 0) {
@ -94,7 +94,7 @@
                    } else if (value == 1){
                        is_checked = 'checked="checked"';
                    }
-                    var field = "display";
+                    var field = "status";
                    result = '<label class="lyear-switch switch-primary switch-solid lyear-status"><input type="checkbox" '+ is_checked +'><span  onClick="updateStatus('+ row.id +', '+ value +', \''+ field +'\')"></span></label>';
                    return result;
                },
--- a/app/common.php
+++ b/app/common.php
@ -1,6 +1,6 @@
 <?php
 use app\common\model\SystemConfig;
-use app\common\constant\Config;
+use app\common\constant\Data;
 // 应用公共文件
 if (!function_exists('system_config_more'))
 {
@ -14,10 +14,10 @@ if (!function_exists('system_config_more'))
     */
    function system_config_more(array $formNames): array
    {
-        $systemConfig = cache(Config::DATA_SYSTEM_CONFIG);
+        $systemConfig = cache(Data::DATA_SYSTEM_CONFIG);
        if (empty($systemConfig)){
            $systemConfig = SystemConfig::getSystemConfigValues();
-            cache(Config::DATA_SYSTEM_CONFIG,$systemConfig);
+            cache(Data::DATA_SYSTEM_CONFIG,$systemConfig);
        }
        $data = [];
        foreach ($formNames as $v){
@ -74,10 +74,10 @@ if (!function_exists('system_config'))
     */
    function system_config(string $formName): string
    {
-        $systemConfig = cache(Config::DATA_SYSTEM_CONFIG);
+        $systemConfig = cache(Data::DATA_SYSTEM_CONFIG);
        if (empty($systemConfig)){
            $systemConfig = SystemConfig::getSystemConfigValues();
-            cache(Config::DATA_SYSTEM_CONFIG,$systemConfig);
+            cache(Data::DATA_SYSTEM_CONFIG,$systemConfig);
        }
        return $systemConfig[$formName]??'';
    }
--- a/app/common/constant/Config.php
+++ b/app/common/constant/Config.php
@ -7,7 +7,7 @@
 namespace app\common\constant;


-class Config
+class Data
 {

    const DATA_FRIEND_LINK  = 'data_friend_link'; //友链
--- a/app/common/model/DocumentCategory.php
+++ b/app/common/model/DocumentCategory.php
@ -25,7 +25,7 @@ class DocumentCategory extends BaseModel
    public static function systemPage($where): array
    {
        $model = new self;
-        $model = $model->field(['id','pid','title','sort','display'])->order('sort asc,id asc');
+        $model = $model->field(['id','pid','title','sort','status'])->order('sort asc,id asc');
        if (isset($where['title']) && $where['title'] != '') $model = $model->where("title|id","like","%$where[title]%");
        $data = $model->select()->toArray();
        return $data ?: [];
--- a/app/index/common.php
+++ b/app/index/common.php
@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------
 use think\facade\Db;
 use think\Exception;
-use app\common\constant\Config;
+use app\common\constant\Data;
 use app\common\model\DocumentCategoryContent;
 use app\common\model\DocumentCategory;
 use app\common\model\Document;
@ -49,7 +49,7 @@ function get_type_content($id, $strip = false)
 function get_document_category_list()
 {
    //缓存文章菜单
-    $documentCategory = cache(Config::DATA_DOCUMENT_CATEGORY_LIST);
+    $documentCategory = cache(Data::DATA_DOCUMENT_CATEGORY_LIST);
    if ($documentCategory === null) {
        $documentCategoryList = DocumentCategory::where('status', 1)->order('sort asc')->select()->toArray();
        //转换，让id作为数组的键
@ -59,7 +59,7 @@ function get_document_category_list()
            $item['url'] = curl($item);
            $documentCategory[$item['id']] = $item;
        }
-        cache(Config::DATA_DOCUMENT_CATEGORY_LIST, $documentCategory);
+        cache(Data::DATA_DOCUMENT_CATEGORY_LIST, $documentCategory);
    }
    return $documentCategory;
 }
@ -114,25 +114,37 @@ function get_document_category_by_name($name, $field = false)

 /**
 * 模板-获取文章分类
+ * @param $type
+ * @param $typeid
+ * @param int $row
+ * @param string $where
+ * @param string $orderby
+ * @return DocumentCategory[]|array|bool|\think\Collection
+ * @throws Exception
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @author 李玉坤
+ * @date 2021-11-12 21:48
 */
-function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '', $display = 1)
+function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '')
 {

    switch ($type) {
        case "all":
            //获取顶级分类
-            return get_document_category_all($display);
+            return get_document_category_all();
            break;
        case 'top':
            //获取顶级分类
-            return get_document_category_by_parent(0, $row, $display);
+            return get_document_category_by_parent(0, $row);
            break;
        case 'son':
            //获取子级分类
            if (!$typeid) {
                throw new Exception('请指定要获取的栏目分类id！');
            }
-            return get_document_category_by_parent($typeid, $row, $display);
+            return get_document_category_by_parent($typeid, $row);
            break;
        case 'self':
            //获取同级分类
@ -143,7 +155,7 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
            if (!$dc) {
                return false;
            }
-            return get_document_category_by_parent($dc['pid'], $row, $display);;
+            return get_document_category_by_parent($dc['pid'], $row);;
            break;
        case 'find':
            //获取所有子孙分类，此操作读取数据库，非缓存！
@ -155,9 +167,6 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
                throw new Exception('分类不存在或已删除！');
            }
            $tempArr = DocumentCategory::where('id', 'in', $dc['child'])->where('status', 1)->limit($row);
-            if ($display) {
-                $tempArr = $tempArr->where('display', 1);
-            }
            $tempArr = $tempArr->select();
            foreach ($tempArr as $key => $item) {
                //根据栏目类型，生成栏目url
@ -186,13 +195,8 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
                //获取根分类，此操作读取数据库，非缓存！
                $dc = DocumentCategory::where('pid', 0)->where('status', 1)
                    ->where("CONCAT(',',child,',') like '%,$typeid,%'")->limit($row);
-                if ($display) {
-                    $dc = $dc->where('display', 1);
-                }
                $dc = $dc->find();
            }
-
-
            //根据栏目类型，生成栏目url
            $dc['url'] = curl($dc);
            $tempArr = [];
@ -202,9 +206,6 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
        case 'where':
            //根据自定义条件获取分类（where语句），此操作读取数据库，非缓存！
            $tempArr = DocumentCategory::where('status', 1)->where($where)->order($orderby)->limit($row);
-            if ($display) {
-                $tempArr = $tempArr->where('display', 1);
-            }
            $tempArr = $tempArr->select();
            foreach ($tempArr as $key => $item) {
                //根据栏目类型，生成栏目url
@ -216,9 +217,6 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
        case 'ids':
            //根据多个栏目id，逗号隔开的那种，获得栏目列表
            $tempArr = DocumentCategory::where('status', 1)->where('id', 'in', $typeid)->order($orderby)->limit($row);
-            if ($display) {
-                $tempArr = $tempArr->where('display', 1);
-            }
            $tempArr = $tempArr->select();
            foreach ($tempArr as $key => $item) {
                //根据栏目类型，生成栏目url
@ -239,7 +237,7 @@ function tpl_get_channel($type, $typeid, $row = 100, $where = '', $orderby = '',
 * $pid=父级id
 * $row=获取多少数目
 */
-function get_document_category_by_parent($pid, $row, $display = 1)
+function get_document_category_by_parent($pid, $row)
 {
    $documentCategoryList = get_document_category_list();
    $x = 1;
@ -248,7 +246,7 @@ function get_document_category_by_parent($pid, $row, $display = 1)
        if ($x > $row) {
            break;
        }
-        if ($item['pid'] == $pid && ($display ? $item['display'] == 1 : true)) {
+        if ($item['pid'] == $pid) {
            $x = $x + 1;
            array_push($tempArr, $item);
        }
@ -256,19 +254,17 @@ function get_document_category_by_parent($pid, $row, $display = 1)
    return $tempArr;
 }

-function get_document_category_all( $display = 1)
+function get_document_category_all()
 {
    $documentCategoryList = get_document_category_list();
    $tempArr = array();
    foreach ($documentCategoryList as $item) {
-        if (($display ? $item['display'] == 1 : true)) {
        if ($item['pid'] == 0){
            $tempArr[$item['id']] = $item;
        }else{
            $tempArr[$item['pid']]['child'][] = $item;
        }
    }
-    }
    return $tempArr;
 }

@ -537,10 +533,10 @@ function tpl_get_product_list($cid, $row, $orderby, $table = 'article', $type =
 */
 function tpl_get_friend_link($type, $row)
 {
-    $flinkList = cache(Config::DATA_FRIEND_LINK);
+    $flinkList = cache(Data::DATA_FRIEND_LINK);
    if ($flinkList === null) {
        $flinkList = FriendLink::where('status', 1)->order('sort asc')->limit($row)->select();
-        cache(Config::DATA_FRIEND_LINK, $flinkList);
+        cache(Data::DATA_FRIEND_LINK, $flinkList);
    }
    if ($type === 0) {
        return $flinkList;
@ -559,10 +555,10 @@ function tpl_get_friend_link($type, $row)
 */
 function tpl_get_banner($type, $row)
 {
-    $bannerList = cache(Config::DATA_BANNER);
+    $bannerList = cache(Data::DATA_BANNER);
    if ($bannerList === null) {
        $bannerList = Db::name('slides')->where('status', 1)->order('sort asc')->limit($row)->select();
-        cache(Config::DATA_BANNER, $bannerList);
+        cache(Data::DATA_BANNER, $bannerList);
    }
    if ($type === 0) {
        return $bannerList;
@ -617,10 +613,10 @@ if (!function_exists('web_config')) {
     */
    function web_config(string $formName): string
    {
-        $webConfig = cache(Config::DATA_SYSTEM_CONFIG);
+        $webConfig = cache(Data::DATA_SYSTEM_CONFIG);
        if (empty($webConfig)) {
            $webConfig = Db::name('system_config')->where("status", 1)->column('value', 'form_name');
-            cache(Config::DATA_SYSTEM_CONFIG, $webConfig);
+            cache(Data::DATA_SYSTEM_CONFIG, $webConfig);
        }
        return $webConfig[$formName] ?? '';
    }
@ -755,7 +751,7 @@ function IsActiveNav($curr_cid = false, $cid = false)
    }

    //判断是否在同一栏目树下。
-    $parent_id = cache(Config::CURR_CATEGORY_PATENT_ID);
+    $parent_id = cache(Data::CURR_CATEGORY_PATENT_ID);

    $parent_id = explode(',', $parent_id);

--- a/app/index/controller/Article.php
+++ b/app/index/controller/Article.php
@ -8,7 +8,7 @@ use app\common\model\Comment as commentModel;
 use app\common\model\Tag as TagModel;
 use app\Request;
 use think\facade\Log;
-use app\common\constant\Config;
+use app\common\constant\Data;

 /**
 * 应用入口
@ -90,7 +90,7 @@ class Article extends Base
        //当前页面所属分类id
        $this->assign('cid',$id);
        //缓存当前页面栏目分类树ids
-        cache(Config::CURR_CATEGORY_PATENT_ID,$dc['pid']?$dc['pid'].','.$id:$id);
+        cache(Data::CURR_CATEGORY_PATENT_ID,$dc['pid']?$dc['pid'].','.$id:$id);
        //去除后缀
        $listTmp = substr($listTmp,0,strpos($listTmp,'.'));
        return $this->fetch('category/'.$listTmp);
@ -156,7 +156,7 @@ class Article extends Base
        //当前页面所属分类id
        $this->assign('cid',$article['category_id']);
        //缓存当前页面栏目分类树ids
-        cache(Config::CURR_CATEGORY_PATENT_ID,$dc['pid']?$dc['pid'].','.$article['category_id']:$article['category_id']);
+        cache(Data::CURR_CATEGORY_PATENT_ID,$dc['pid']?$dc['pid'].','.$article['category_id']:$article['category_id']);
        //设置文章的url
        $article['link_str']=aurl($article);
        //判断后台统计配置是否开启 1 开启
@ -228,7 +228,7 @@ class Article extends Base
        $this->assign('tag',$tag);

        //清除可能存在的栏目分类树id
-        cache(Config::CURR_CATEGORY_PATENT_ID,false);
+        cache(Data::CURR_CATEGORY_PATENT_ID,false);
        //模板兼容性标签
        $this->assign('id',false);
        $this->assign('cid',false);
@ -285,7 +285,7 @@ class Article extends Base
        $this->assign('apeField',$apeField);
        $this->assign('kw',$kw);
        //清除可能存在的栏目分类树id
-        cache(Config::CURR_CATEGORY_PATENT_ID,false);
+        cache(Data::CURR_CATEGORY_PATENT_ID,false);
        //模板兼容性标签
        $this->assign('id',false);
        $this->assign('cid',false);
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@ -6,7 +6,7 @@ use app\common\model\FriendLink as friendLinkModel;
 use app\common\validate\MessageForm as MessageformValidate;
 use app\common\model\MessageForm as MessageFormModel;
 use app\Request;
-use app\common\constant\Config;
+use app\common\constant\Data;

 /**
 * 应用入口
@ -26,7 +26,7 @@ class Index extends Base
            $this->urlrecord('网站首页');
        }
        //清除可能存在的栏目分类树id
-        cache(Config::CURR_CATEGORY_PATENT_ID,false);
+        cache(Data::CURR_CATEGORY_PATENT_ID,false);
        //模板兼容性标签
        $this->assign('id',false);
        $this->assign('cid',false);
@ -70,7 +70,7 @@ class Index extends Base
            }
        } else {
            //清除可能存在的栏目分类树id
-            cache(Config::CURR_CATEGORY_PATENT_ID,false);
+            cache(Data::CURR_CATEGORY_PATENT_ID,false);
            //模板兼容性标签
            $this->assign('id',false);
            $this->assign('cid',false);
@ -110,7 +110,7 @@ class Index extends Base
            }
        } else {
            //清除可能存在的栏目分类树id
-            cache(Config::CURR_CATEGORY_PATENT_ID,false);
+            cache(Data::CURR_CATEGORY_PATENT_ID,false);
            //模板兼容性标签
            $this->assign('id',false);
            $this->assign('cid',false);
--- a/public/install/js/validate.js
+++ b/public/install/js/validate.js
@ -1093,7 +1093,6 @@ $.extend($.validator, {
 		// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
 		equalTo: function(value, element, param) {
 			// bind to the blur event of the target in order to revalidate whenever the target field is updated
-			// TODO find a way to bind the event just once, avoiding the unbind-rebind overhead
 			var target = $(param).unbind(".validate-equalTo").bind("blur.validate-equalTo", function() {
 				$(element).valid();
 			});
@ -1149,7 +1148,6 @@ $.format = $.validator.format;
 // handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
 ;(function($) {
 	// only implement if not provided by jQuery core (since 1.4)
-	// TODO verify if jQuery 1.4's implementation is compatible with older jQuery special-event APIs
 	if (!jQuery.event.special.focusin && !jQuery.event.special.focusout && document.addEventListener) {
 		$.each({
 			focus: 'focusin',
--- a/public/static/admin/js/Chart.js
+++ b/public/static/admin/js/Chart.js
@ -2023,7 +2023,6 @@ module.exports = {
        this._config = config;
        // Lenient ordinal parsing accepts just a number in addition to
        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-        // TODO: Remove "ordinalParse" fallback in next major release.
        this._dayOfMonthOrdinalParseLenient = new RegExp(
            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
                '|' + (/\d{1,2}/).source);
@ -2666,7 +2665,6 @@ module.exports = {
            this._shortMonthsParse = [];
        }

-        // TODO: add sorting
        // Sorting makes sure if one month (or abbr) is a prefix of another
        // see sorting in computeMonthsParse
        for (i = 0; i < 12; i++) {
@ -2706,7 +2704,6 @@ module.exports = {
                value = toInt(value);
            } else {
                value = mom.localeData().monthsParse(value);
-                // TODO: Another silent failure?
                if (!isNumber(value)) {
                    return mom;
                }
@ -3494,7 +3491,6 @@ module.exports = {

    function loadLocale(name) {
        var oldLocale = null;
-        // TODO: Find a better way to register and load all the locales in Node
        if (!locales[name] && (typeof module !== 'undefined') &&
                module && module.exports) {
            try {
@ -3774,7 +3770,6 @@ module.exports = {
            dow = 1;
            doy = 4;

-            // TODO: We need to take the current isoWeekYear, but that depends on
            // how we interpret now (local, utc, fixed offset). So create
            // a now version of current config (take local/utc/offset flags, and
            // create now).
@ -3949,7 +3944,6 @@ module.exports = {

    function checkWeekday(weekdayStr, parsedInput, config) {
        if (weekdayStr) {
-            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
            if (weekdayProvided !== weekdayActual) {
@ -4053,7 +4047,6 @@ module.exports = {

    // date from string and format string
    function configFromStringAndFormat(config) {
-        // TODO: Move this to another part of the creation flow to prevent circular deps
        if (config._f === hooks.ISO_8601) {
            configFromISO(config);
            return;
@ -4348,7 +4341,6 @@ module.exports = {
        return res;
    }

-    // TODO: Use [].sort instead?
    function min () {
        var args = [].slice.call(arguments, 0);

--- a/public/template/default/info.json
+++ b/public/template/default/info.json
@ -1,6 +1,6 @@
 {
    "title":"默认主题",
-    "author":"MonkeyCode",
+    "author":"木子的忧伤",
    "demo_url":"http://default.lcm.wang/",
    "category_list":[
        {
--- a/public/template/default/pc/article/detail.html
+++ b/public/template/default/pc/article/detail.html
@ -177,7 +177,7 @@
                          </div>
                        </div>
                                <div class="post-turn-page-plane">
-                                    <div class="post-turn-page post-turn-page-previous" style="background-image:url()">
+                                    <div class="post-turn-page post-turn-page-previous">
                                        <div class="post-turn-page-main">
                                            {ape:prenext get="pre" cid="$apeField['category_id']"}
                                            <div>
@ -189,7 +189,7 @@
                                            {/ape:prenext}
                                        </div>
                                    </div>
-                                    <div class="post-turn-page post-turn-page-next" style="background-image:url(../wp-content/uploads/2020/12/oracleAP_Payments_GL_Voucher.png)">
+                                    <div class="post-turn-page post-turn-page-next" >
                                        {ape:prenext get="next" cid="$apeField['category_id']"}
                                        <div class="post-turn-page-main">
                                            <a href="{:url('/index/article/detail')}?id={$field['id']}">{$field['title']}</a>
--- a/public/template/default/pc/article/list_default.html
+++ b/public/template/default/pc/article/list_default.html
@ -177,7 +177,7 @@
                          </div>
                        </div>
                                <div class="post-turn-page-plane">
-                                    <div class="post-turn-page post-turn-page-previous" style="background-image:url()">
+                                    <div class="post-turn-page post-turn-page-previous">
                                        <div class="post-turn-page-main">
                                            {ape:prenext get="pre" cid="$apeField['category_id']"}
                                            <div>
@ -189,7 +189,7 @@
                                            {/ape:prenext}
                                        </div>
                                    </div>
-                                    <div class="post-turn-page post-turn-page-next" style="background-image:url(../wp-content/uploads/2020/12/oracleAP_Payments_GL_Voucher.png)">
+                                    <div class="post-turn-page post-turn-page-next">
                                        {ape:prenext get="next" cid="$apeField['category_id']"}
                                        <div class="post-turn-page-main">
                                            <a href="{:url('/index/article/detail')}?id={$field['id']}">{$field['title']}</a>
--- a/public/template/default/pc/category/list_default.html
+++ b/public/template/default/pc/category/list_default.html
@ -135,11 +135,10 @@
                    }
                  </style>
                    <script>
-                    var tag = TagCloud(
+                        $.get("{:url('/index/article/taglist')}",function(data,status){
+                            TagCloud(
                                ".corepress-tag-container-tag1",
-                      JSON.parse(
-                        '[{"text":"WordPress","href":"https:\/\/www.lovestu.com\/tag\/wordpress"},{"text":"WordPress\u7248\u672c","href":"https:\/\/www.lovestu.com\/tag\/wordpress%e7%89%88%e6%9c%ac"},{"text":"\u4e3b\u9898","href":"https:\/\/www.lovestu.com\/tag\/%e4%b8%bb%e9%a2%98"},{"text":"\u4ee3\u7801","href":"https:\/\/www.lovestu.com\/tag\/code"},{"text":"\u4f7f\u7528\u6559\u7a0b","href":"https:\/\/www.lovestu.com\/tag\/tutorial"}]'
-                      ),
+                                data.data,
                                {},
                                [
                                    "#67C23A",
@ -151,8 +150,15 @@
                                    "#99CCFF",
                                    "#FF9999",
                                    "#CC6633",
+                                    "#67C23A",
+                                    '#ef5b9c',
+                                    '#fcaf17',
+                                    '#009ad6',
+                                    '#003A8C',
+                                    '#f36c21'
                                ]
                            );
+                        });
                    </script>
                </div>
                {ape:advert row="3" type="2"}
--- a/public/template/default/pc/css/all.min.css
+++ b/public/template/default/pc/css/all.min.css
--- a/public/template/default/pc/lib/highlight/style/corepress.css
+++ b/public/template/default/pc/lib/highlight/style/corepress.css
@ -1,66 +1,80 @@
-.hljs-comment, .hljs-quote {
-    color: #696969
+.hljs-comment,
+.hljs-quote {
+    color: #969896;
 }

-.hljs-deletion, .hljs-name, .hljs-regexp, .hljs-selector-class, .hljs-selector-id, .hljs-tag, .hljs-template-variable, .hljs-variable {
-    color: #d91e18
+/* Tomorrow Red */
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-regexp,
+.hljs-deletion {
+    color: #ff8383;
 }

-.hljs-built_in, .hljs-builtin-name, .hljs-link, .hljs-literal, .hljs-meta, .hljs-number, .hljs-params, .hljs-type {
-    color: #aa5d00
+/* Tomorrow Orange */
+.hljs-number,
+.hljs-built_in,
+.hljs-builtin-name,
+.hljs-literal,
+.hljs-type,
+.hljs-params,
+.hljs-meta,
+.hljs-link {
+    color: #de935f;
 }

+/* Tomorrow Yellow */
 .hljs-attribute {
-    color: #aa5d00
+    color: #e9d27e;
 }

-.hljs-addition, .hljs-bullet, .hljs-string, .hljs-symbol {
-    color: green
+/* Tomorrow Green */
+.hljs-string,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-addition {
+    color: #b5f4a5;
 }

-.hljs-section, .hljs-title {
-    color: #007faa
+/* Tomorrow Blue */
+.hljs-title,
+.hljs-section {
+    color: #93ddfd;
 }
-
-.hljs-keyword, .hljs-selector-tag {
-    color: #7928a1
+/* Tomorrow Purple */
+.hljs-keyword,
+.hljs-selector-tag {
+    color: #d9a9ff;
 }

 .hljs {
    display: block;
    overflow-x: auto;
-    color: #545454;
-    padding: .5em
+    background: #2d3748;
+    color: #c5c8c6;
+    padding: 0.5em;
 }

 .hljs-emphasis {
-    font-style: italic
+    font-style: italic;
 }

 .hljs-strong {
-    font-weight: 700
-}
-
-@media screen and (-ms-high-contrast: active) {
-    .hljs-addition, .hljs-attribute, .hljs-built_in, .hljs-builtin-name, .hljs-bullet, .hljs-comment, .hljs-link, .hljs-literal, .hljs-meta, .hljs-number, .hljs-params, .hljs-quote, .hljs-string, .hljs-symbol, .hljs-type {
-        color: highlight
-    }
-
-    .hljs-keyword, .hljs-selector-tag {
-        font-weight: 700
-    }
+    font-weight: bold;
 }


 pre.corepress-code-pre code {
    position: relative;
    border-radius: 5px;
-    background: #fafafa;
    max-height: 500px;
    overflow: auto;
    padding: 10px 20px;
-    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace, sans-serif;
-}
+   }

 .corepress-code-pre:hover .code-bar {
    visibility: visible;
@ -86,6 +100,7 @@ pre.corepress-code-pre code {
    cursor: pointer;
 }
 .code-bar-btn-copy-fonticon {
+    color: #fff;
    cursor: pointer;
 }
 pre[class='corepress-code-pre'] {
@ -96,9 +111,9 @@ pre[class='corepress-code-pre'] {
    padding: 0;
    max-height: unset;
    overflow: unset;
-    background-color: #fafafa;
 }

+
 .hljs ul {
    list-style: decimal;
    margin: 0px 0px 0 20px !important;
@ -113,3 +128,6 @@ pre[class='corepress-code-pre'] {
    word-break: break-all;
    word-wrap: break-word;
 }
+.hijs-line-number {
+
+}
--- a/public/template/default/pc/css/jquery.fancybox.min.css
+++ b/public/template/default/pc/css/jquery.fancybox.min.css
--- a/public/template/default/pc/css/main-mobile-pro.css
+++ b/public/template/default/pc/css/main-mobile-pro.css
@ -0,0 +1,15 @@
+/**
+Pro-移动适配
+ */
+
+@media screen and (max-width: 800px) {
+    body .sidebarlist-main {
+        display: none;
+    }
+}
+
+@media screen and (max-width: 1040px) {
+    body .header-main-location-left {
+        justify-content: space-between;
+    }
+}
--- a/public/template/default/pc/css/main-mobile.css
+++ b/public/template/default/pc/css/main-mobile.css
@ -1,3 +1,485 @@
 /**
 移动适配
- */.mobile-menu-btn,.mobile-search-btn{display:none;padding:10px}@media screen and (max-width:1040px){body .user-menu-pc-search{display:none}body .header-menu{display:none!important}body .header-logo img{height:40px}body .mobile-search-btn{display:block}body .mobile-menu-btn,.mobile-search-btn{display:block}.menu-header-list>.menu-item-has-children:after,.user-menu:after{display:none}body .menu-header-list>.menu-item>a:before{display:none!important}body .menu-header-list>.menu-item{padding:0}header .current-menu-item:before{display:none!important}body .ad-plane-post{padding:10px;margin-top:-10px}body .menu-header-list{flex-direction:column}body .sub-menu{width:100%}body .user-sub-menu{width:100%;left:unset}.m-dropdown{display:block;position:absolute;right:3px;top:0;width:50px;text-align:center;line-height:62px;transition:all .3s ease-out 0s}body .sub-menu-show{visibility:visible;opacity:1}body .sub-menu-hide{visibility:hidden!important;opacity:0!important;top:60px!important}body .sub-menu .sub-menu{left:0;top:100%}}@media screen and (max-width:800px){body .slide-title{font-size:20px}body .post-item-sticky{padding:2px 4px}::-webkit-scrollbar{width:4px!important;height:4px!important}body .post-item-meta-author{display:none}body .index-top-postcard-item{margin-bottom:10px}body .carousel{margin-bottom:10px}body .index-top-postcard-item{flex-basis:49%}body .post-qrcode-btn{display:none}body .post-content{padding:15px}body .post-info{margin-bottom:10px}body .post-info-right{display:none}body .post-item-thumbnail{flex:35%;flex-shrink:0}body .post-item h2{font-size:18px}body .mobile-menu-btn,.mobile-search-btn{display:block}body .sidebar,.footer-container{display:none}body .header-main{justify-content:space-between}body .go-top-plane{display:none}body .post-main{margin:0;margin-bottom:10px;flex-basis:95%!important}body .header-logo img{height:40px}body .html-main{justify-content:center}.footer-container .footer-left{flex:100%;flex-shrink:0}.footer-container .footer-right,.footer-container .footer-aside-box,.footer-container .menu-footer-plane{display:none}.frinds-links{display:none}body .c-downbtn-item{width:100%}body .usercenter-plane{display:block}body .usercenter-menu{margin-bottom:10px}body .usercenter-right{margin-left:0}body .header-zhanwei{min-height:50px!important}}@media screen and (max-width:500px){body .cat-item{font-size:12px}body .post-item-tags{display:none}body .index-top-postcard-item{flex-basis:48%}body .post-item h2{font-size:16px}body .pageobj-item{display:none}body .commentlist{padding:0 20px}body .commentlist>.comment>.children{padding-left:30px}body .comment-pub-time{font-size:12px}body .commentlist>.comment>.children>.comment{padding:0 10px}body .comment-metadata{margin-left:10px}body .comment-btn-reply{opacity:1;visibility:visible}body .comment-reply-link{font-size:12px}body .top-divider{min-height:60px}body .c-downbtn-item{display:block}body .c-downbtn-describe{margin-bottom:10px}body .post-turn-page-plane,body .post-info-left{display:none}body .post-title{margin-bottom:0}body #reward-plane img{max-width:150px}body .post-pop-plane{padding:10px}}@media screen and (max-width:1384px){#post-catalog{visibility:hidden!important}#post-catalog-bar{visibility:hidden!important}}@media screen and (max-width:500px){body .post-content{padding:10px}.post-item-content{display:none}body .logged-in-as{display:none}body .post-item-info-type1{display:none}}@media screen and (max-width:360px){body .theme-copyright{display:none}}.drawer-menu-plane-show{visibility:visible!important;left:0!important;opacity:1!important}.drawer-menu-plane{opacity:0;display:flex;visibility:hidden;position:fixed;top:0;left:-100px;right:0;bottom:0;overflow:hidden;z-index:9999;transition:all .3s ease-out 0s}.drawer-menu-list{position:relative;flex:70%;max-width:400px;background:#fff;overflow-y:auto}.drawer-menu-write{flex:30%;background:#000;opacity:.4}.mobile-menu-header-list .menu-item{padding:10px}.dialog-search-plane-show{visibility:visible!important}.dialog-search-plane-show .dialog-plane{opacity:1!important;top:0!important}.dialog-search-plane{display:flex;visibility:hidden;position:fixed;top:0;left:0;right:0;bottom:0;overflow:hidden;z-index:9999;justify-content:center;align-items:center}.dialog-mask{position:absolute;top:0;left:0;right:0;bottom:0;opacity:.4;background:#000}.dialog-plane{padding:10px;top:-100px;transition:all .3s ease-out 0s;opacity:0;position:relative;flex:70%;max-width:400px;background:#fff;z-index:99999;height:150px;border-radius:4px;text-align:center}.dialog-plane h2{font-size:20px;font-weight:500;padding:6px 10px}.dialog-plane .search-form{padding:20px}
+ */
+.mobile-menu-btn, .mobile-search-btn {
+    display: none;
+    padding: 10px;
+}
+.menu-mobile {
+    width: 100%;
+}
+/* 主菜单 */
+.menu-mobile .menu-item {
+    position: relative;
+}
+/* 二级菜单,默认隐藏 */
+.menu-mobile .menu-item>.sub-menu {
+    overflow: hidden;
+    display: none;
+}
+
+/* 显示二级菜单 */
+.sub-menu-show {
+
+    visibility: visible !important;
+    height: 100% !important;
+    opacity: 1 !important;
+}
+
+.menu-mobile .menu-item a {
+    border-bottom: 1px solid #f0f0f0;
+    display: block;
+    color: #4e5358;
+    font-size: 14px;
+    padding: 10px;
+}
+
+/* 下拉样式 */
+.menu-mobile .mobile-m-dropdown {
+    position: absolute;
+    right: 0;
+    top: 0;
+    border-left: 1px solid #F0F0F0;
+    width: 48px;
+    text-align: center;
+    font-size: 14px;
+    line-height: 38px;
+}
+
+.menu-mobile .mobile-m-dropdown i {
+    transition:  .3s;
+}
+
+.menu-mobile .m-dropdown-show-i {
+    transform: rotate(-90deg);
+}
+
+@media screen and (max-width: 1040px) {
+    body .menu-header-plane{
+        display: none;
+    }
+    body .user-menu-pc-search {
+        display: none;
+    }
+
+    body .header-menu {
+        display: none !important;
+    }
+
+    body .header-logo img {
+        height: 40px;
+    }
+
+    body .mobile-search-btn {
+        display: block;
+    }
+
+    body .mobile-menu-btn, .mobile-search-btn {
+        display: block;
+    }
+
+    .menu-header-list > .menu-item-has-children:after, .user-menu:after {
+        display: none;
+    }
+
+    body .menu-header-list > .menu-item > a:before {
+        display: none !important;
+    }
+
+    body .menu-header-list > .menu-item {
+        padding: 0;
+    }
+
+    header .current-menu-item:before {
+        display: none !important;
+    }
+
+    body .ad-plane-post {
+        padding: 10px;
+        margin-top: -10px;
+    }
+
+    /**菜单适配
+
+     */
+    body .menu-header-list {
+        flex-direction: column;
+    }
+
+    body .sub-menu {
+        width: 100%;
+    }
+
+    body .user-sub-menu {
+        width: 100%;
+        left: unset;
+    }
+
+    .m-dropdown {
+        display: block;
+        position: absolute;
+        right: 3px;
+        top: 0;
+        width: 50px;
+        text-align: center;
+        line-height: 62px;
+        transition: all .3s ease-out 0s;
+    }
+
+    body .sub-menu-show {
+        visibility: visible;
+        opacity: 1;
+
+    }
+
+    body .sub-menu-hide {
+        visibility: hidden !important;
+        opacity: 0 !important;
+        top: 60px !important;
+    }
+
+    body .sub-menu .sub-menu {
+        left: 0;
+        top: 100%;
+    }
+
+}
+
+@media screen and (max-width: 800px) {
+    body .slide-title {
+        font-size: 20px;
+    }
+
+    body .post-item-sticky {
+        padding: 2px 4px;
+    }
+
+    ::-webkit-scrollbar {
+        width: 4px !important; /*对垂直流动条有效*/
+        height: 4px !important; /*对水平流动条有效*/
+    }
+
+    body .post-item-meta-author {
+        display: none;
+    }
+
+    body .index-top-postcard-item {
+        margin-bottom: 10px;
+    }
+
+    body .carousel {
+        margin-bottom: 10px;
+
+    }
+
+    body .index-top-postcard-item {
+        flex-basis: 49%;
+    }
+
+    body .post-qrcode-btn {
+        display: none;
+    }
+
+    body .post-content {
+        padding: 15px;
+    }
+
+    body .post-info {
+        margin-bottom: 10px;
+    }
+
+
+    body .post-info-right {
+        display: none;
+    }
+
+    body .post-item-thumbnail {
+        flex: 35%;
+        flex-shrink: 0;
+    }
+
+    body .post-item h2 {
+        font-size: 18px;
+    }
+
+    body .mobile-menu-btn, .mobile-search-btn {
+        display: block;
+    }
+
+    body .sidebar, .footer-container {
+        display: none;
+    }
+
+    body .header-main {
+        justify-content: space-between;
+    }
+
+    body .go-top-plane {
+        display: none;
+    }
+
+    body .post-main {
+        margin: 0;
+        margin-bottom: 10px;
+        flex-basis: 95% !important;
+    }
+
+    body .header-logo img {
+        height: 40px;
+    }
+
+    body .html-main {
+        justify-content: center;
+    }
+
+    .footer-container .footer-left {
+        flex: 100%;
+        flex-shrink: 0;
+    }
+
+    .footer-container .footer-right, .footer-container .footer-aside-box, .footer-container .menu-footer-plane {
+        display: none;
+    }
+
+    .frinds-links {
+        display: none;
+    }
+
+    body .c-downbtn-item {
+        width: 100%;
+    }
+
+    body .usercenter-plane {
+        display: block;
+    }
+
+    body .usercenter-menu {
+        margin-bottom: 10px;
+    }
+
+    body .usercenter-right {
+        margin-left: 0;
+    }
+
+    body .header-zhanwei {
+        min-height: 50px !important;
+    }
+}
+
+@media screen and (max-width: 500px) {
+    body .cat-item {
+        font-size: 12px;
+    }
+
+    body .post-item-tags {
+        display: none;
+    }
+
+    body .index-top-postcard-item {
+        flex-basis: 48%;
+    }
+
+    body .post-item h2 {
+        font-size: 16px;
+    }
+
+    body .pageobj-item {
+        display: none;
+    }
+
+
+    body .commentlist {
+        padding: 0 20px;
+    }
+
+    body .commentlist > .comment > .children {
+        padding-left: 30px;
+    }
+
+    body .comment-pub-time {
+        font-size: 12px;
+    }
+
+    body .commentlist > .comment > .children > .comment {
+        padding: 0 10px;
+    }
+
+    body .comment-metadata {
+        margin-left: 10px;
+    }
+
+    body .comment-btn-reply {
+        opacity: 1;
+        visibility: visible;
+    }
+
+    body .comment-reply-link {
+        font-size: 12px;
+    }
+
+    body .top-divider {
+        min-height: 60px;
+    }
+
+    body .c-downbtn-item {
+        display: block;
+    }
+
+    body .c-downbtn-describe {
+        margin-bottom: 10px;
+    }
+
+    body .post-turn-page-plane, body .post-info-left {
+        display: none;
+    }
+
+    body .post-title {
+        margin-bottom: 0;
+    }
+
+    body #reward-plane img {
+        max-width: 150px;
+    }
+
+    body .post-pop-plane {
+        padding: 10px;
+    }
+
+}
+
+@media screen and (max-width: 1384px) {
+    #post-catalog {
+        visibility: hidden !important;
+    }
+
+    #post-catalog-bar {
+        visibility: hidden !important;
+    }
+}
+
+@media screen and (max-width: 500px) {
+    body .post-content {
+        padding: 10px;
+    }
+
+    .post-item-content {
+        display: none;
+    }
+
+    body .logged-in-as {
+        display: none;
+    }
+
+    body .post-item-info-type1 {
+        display: none;
+    }
+}
+
+@media screen and (max-width: 360px) {
+    body .theme-copyright {
+        display: none;
+    }
+
+}
+
+/**
+移动菜单栏
+ */
+.drawer-menu-plane-show {
+    visibility: visible !important;
+    left: 0 !important;
+    opacity: 1 !important;
+}
+
+.drawer-menu-plane {
+    opacity: 0;
+    display: flex;
+    visibility: hidden;
+    position: fixed;
+    top: 0;
+    left: -100px;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: 9999;
+    transition: all .3s ease-out 0s;
+}
+
+.drawer-menu-list {
+    position: relative;
+    flex: 70%;
+    max-width: 400px;
+    background: #fff;
+    overflow-y: auto;
+}
+
+.drawer-menu-write {
+    flex: 30%;
+    background: #000;
+    opacity: 0.4;
+}
+
+.mobile-menu-header-list .menu-item {
+    padding: 10px;
+}
+
+/**
+搜索
+ */
+.dialog-search-plane-show {
+    visibility: visible !important;
+}
+
+.dialog-search-plane-show .dialog-plane {
+    opacity: 1 !important;
+    top: 0 !important;
+}
+
+.dialog-search-plane {
+    display: flex;
+    visibility: hidden;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: 9999;
+    justify-content: center;
+    align-items: center;
+}
+
+.dialog-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0.4;
+    background: #000;
+}
+
+.dialog-plane {
+    padding: 10px;
+    top: -100px;
+    transition: all .3s ease-out 0s;
+    opacity: 0;
+    position: relative;
+    flex: 70%;
+    max-width: 400px;
+    background: #fff;
+    z-index: 99999;
+    height: 150px;
+    border-radius: 4px;
+    text-align: center;
+}
+
+.dialog-plane h2 {
+    font-size: 20px;
+    font-weight: 500;
+    padding: 6px 10px;
+}
+
+.dialog-plane .search-form {
+    padding: 20px;
+}
--- a/public/template/default/pc/css/main-pro.css
+++ b/public/template/default/pc/css/main-pro.css
@ -0,0 +1,74 @@
+/**
+侧边栏模块
+ */
+.sidebarlist-item {
+    cursor: var(--cur-pointer), pointer !important;
+}
+
+.sidebarlist-main {
+    position: fixed;
+    bottom: 50%;
+    right: 40px;
+    transition: .30s;
+    z-index: 999;
+}
+
+.sidebarlist-main i {
+    font-size: 26px;
+}
+
+.sidebarlist-icon {
+    width: 24px;
+    height: 24px;
+}
+
+.sidebarlist-item {
+    background: #fff;
+    margin-bottom: 10px;
+    padding: 5px;
+    border-radius: 5px;
+    position: relative;
+    cursor: pointer;
+    box-shadow: 0 0 3px 1px rgba(0, 0, 0, .1);
+}
+
+.sidebarlist-item:hover .sidebarlist-item-content {
+    visibility: visible;
+    right: 120%;
+    opacity: 1;
+}
+
+.sidebarlist-item > a {
+    color: unset;
+}
+
+.sidebarlist-item-content {
+    visibility: hidden;
+    position: absolute;
+    background: #fff;
+    right: 90%;
+    opacity: 0;
+    top: 50%;
+    transition: all .3s ease;
+    width: 250px;
+    padding: 12px;
+    box-shadow: 0 0 3px 1px rgba(0, 0, 0, .1);
+    font-size: 14px;
+    line-height: 1.6;
+    z-index: 1000;
+    cursor: auto;
+    border-radius: var(--border-hd);
+}
+
+.sidebarlist-item-content img {
+    width: 100%;
+    height: auto;
+}
+.header-main-location-left {
+    justify-content: unset;
+}
+
+.header-main-location-left .header-menu {
+    justify-content: space-between;
+    flex: 1;
+}
--- a/public/template/default/pc/css/main.css
+++ b/public/template/default/pc/css/main.css
--- a/public/template/default/pc/css/nprogress.min.css
+++ b/public/template/default/pc/css/nprogress.min.css
@ -0,0 +1 @@
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}
--- a/public/template/default/pc/index/index.html
+++ b/public/template/default/pc/index/index.html
@ -5,16 +5,6 @@
    <meta name="keywords" content="{:web_config('keywords')}">
    <meta name="description" content="{:web_config('description')}">
    {include file="public/head" /}
-    <style>
-        :root {
-            --Maincolor: #409EFF !important;
-            --MaincolorHover: #409EFF !important;
-            --fontSelectedColor: #3390ff !important;
-        }
-        #nprogress .bar {
-            background: var(--Maincolor) !important;
-        }
-    </style>
 </head>
 <body>
 <script>NProgress.start();</script>
@ -258,9 +248,8 @@
        </div>
        <div class="frinds-links">
            <div class="list-plane-title">
-                <div>友情链接 <span class="list-plane-linksdescribe">欢迎添加友情链接</span>
-                </div>
-                <a href="{:url('applylink')}" class="frinds-links-apply">申请友链</a>
+                <div>友情链接 <span class="list-plane-linksdescribe">欢迎添加友情链接</span></div>
+                <div><a href="{:url('applylink')}" class="frinds-links-apply">申请友链</a></div>
            </div>
            <div class="frinds-links-list">
                {ape:flink pagesize="5"}
--- a/public/template/default/pc/js/TagCloud.js
+++ b/public/template/default/pc/js/TagCloud.js
--- a/public/template/default/pc/js/comment-reply.min.js
+++ b/public/template/default/pc/js/comment-reply.min.js
@ -1,2 +1,2 @@
 /*! This file is auto-generated */
-window.addComment=function(v){var I,C,h,E=v.document,b={commentReplyClass:"comment-reply-link",commentReplyTitleId:"reply-title",cancelReplyId:"cancel-comment-reply-link",commentFormId:"commentform",temporaryFormId:"wp-temp-form-div",parentIdFieldId:"comment_parent",postIdFieldId:"comment_post_ID"},e=v.MutationObserver||v.WebKitMutationObserver||v.MozMutationObserver,r="querySelector"in E&&"addEventListener"in v,n=!!E.documentElement.dataset;function t(){d(),e&&new e(o).observe(E.body,{childList:!0,subtree:!0})}function d(e){if(r&&(I=g(b.cancelReplyId),C=g(b.commentFormId),I)){I.addEventListener("touchstart",l),I.addEventListener("click",l);var t=function(e){if((e.metaKey||e.ctrlKey)&&13===e.keyCode)return C.removeEventListener("keydown",t),e.preventDefault(),C.submit.click(),!1};C&&C.addEventListener("keydown",t);for(var n,d=function(e){var t=b.commentReplyClass;e&&e.childNodes||(e=E);t=E.getElementsByClassName?e.getElementsByClassName(t):e.querySelectorAll("."+t);return t}(e),o=0,i=d.length;o<i;o++)(n=d[o]).addEventListener("touchstart",a),n.addEventListener("click",a)}}function l(e){var t,n,d=g(b.temporaryFormId);d&&h&&(g(b.parentIdFieldId).value="0",t=d.textContent,d.parentNode.replaceChild(h,d),this.style.display="none",n=(d=(n=g(b.commentReplyTitleId))&&n.firstChild)&&d.nextSibling,d&&d.nodeType===Node.TEXT_NODE&&t&&(n&&"A"===n.nodeName&&n.id!==b.cancelReplyId&&(n.style.display=""),d.textContent=t),e.preventDefault())}function a(e){var t=g(b.commentReplyTitleId),n=t&&t.firstChild.textContent,d=this,o=m(d,"belowelement"),i=m(d,"commentid"),r=m(d,"respondelement"),t=m(d,"postid"),n=m(d,"replyto")||n;o&&i&&r&&t&&!1===v.addComment.moveForm(o,i,r,t,n)&&e.preventDefault()}function o(e){for(var t=e.length;t--;)if(e[t].addedNodes.length)return void d()}function m(e,t){return n?e.dataset[t]:e.getAttribute("data-"+t)}function g(e){return E.getElementById(e)}return r&&"loading"!==E.readyState?t():r&&v.addEventListener("DOMContentLoaded",t,!1),{init:d,moveForm:function(e,t,n,d,o){var i=g(e);h=g(n);var r,l,a,m,c=g(b.parentIdFieldId),s=g(b.postIdFieldId),y=g(b.commentReplyTitleId),p=y&&y.firstChild,u=p&&p.nextSibling;if(i&&h&&c){void 0===o&&(o=p&&p.textContent),m=h,e=b.temporaryFormId,n=g(e),y=(y=g(b.commentReplyTitleId))?y.firstChild.textContent:"",n||((n=E.createElement("div")).id=e,n.style.display="none",n.textContent=y,m.parentNode.insertBefore(n,m)),d&&s&&(s.value=d),c.value=t,I.style.display="",i.parentNode.insertBefore(h,i.nextSibling),p&&p.nodeType===Node.TEXT_NODE&&(u&&"A"===u.nodeName&&u.id!==b.cancelReplyId&&(u.style.display="none"),p.textContent=o),I.onclick=function(){return!1};try{for(var f=0;f<C.elements.length;f++)if(r=C.elements[f],l=!1,"getComputedStyle"in v?a=v.getComputedStyle(r):E.documentElement.currentStyle&&(a=r.currentStyle),(r.offsetWidth<=0&&r.offsetHeight<=0||"hidden"===a.visibility)&&(l=!0),"hidden"!==r.type&&!r.disabled&&!l){r.focus();break}}catch(e){}return!1}}}}(window);
+window.addComment=function(v){var I,C,h,E=v.document,b={commentReplyClass:"comment-reply-link",commentReplyTitleId:"reply-title",cancelReplyId:"cancel-comment-reply-link",commentFormId:"commentform",temporaryFormId:"wp-temp-form-div",parentIdFieldId:"comment_parent",postIdFieldId:"comment_post_ID"},e=v.MutationObserver||v.WebKitMutationObserver||v.MozMutationObserver,r="querySelector"in E&&"addEventListener"in v,n=!!E.documentElement.dataset;function t(){d(),e&&new e(o).observe(E.body,{childList:!0,subtree:!0})}function d(e){if(r&&(I=g(b.cancelReplyId),C=g(b.commentFormId),I)){I.addEventListener("touchstart",l),I.addEventListener("click",l);var t=function(e){if((e.metaKey||e.ctrlKey)&&13===e.keyCode)return C.removeEventListener("keydown",t),e.preventDefault(),C.submit.click(),!1};C&&C.addEventListener("keydown",t);for(var n,d=function(e){var t=b.commentReplyClass;e&&e.childNodes||(e=E);t=E.getElementsByClassName?e.getElementsByClassName(t):e.querySelectorAll("."+t);return t}(e),o=0,i=d.length;o<i;o++)(n=d[o]).addEventListener("touchstart",a),n.addEventListener("click",a)}}function l(e){var t,n,d=g(b.temporaryFormId);d&&h&&(g(b.parentIdFieldId).value="0",t=d.textContent,d.parentNode.replaceChild(h,d),this.style.display="none",n=(d=(n=g(b.commentReplyTitleId))&&n.firstChild)&&d.nextSibling,d&&d.nodeType===Node.TEXT_NODE&&t&&(n&&"A"===n.nodeName&&n.id!==b.cancelReplyId&&(n.style.display=""),d.textContent=t),e.preventDefault())}function a(e){var t=g(b.commentReplyTitleId),n=t&&t.firstChild.textContent,d=this,o=m(d,"belowelement"),i=m(d,"commentid"),r=m(d,"respondelement"),t=m(d,"postid"),n=m(d,"replyto")||n;o&&i&&r&&t&&!1===v.addComment.moveForm(o,i,r,t,n)&&e.preventDefault()}function o(e){for(var t=e.length;t--;)if(e[t].addedNodes.length)return void d()}function m(e,t){return n?e.dataset[t]:e.getAttribute("data-"+t)}function g(e){return E.getElementById(e)}return r&&"loading"!==E.readyState?t():r&&v.addEventListener("DOMContentLoaded",t,!1),{init:d,moveForm:function(e,t,n,d,o){var i=g(e);h=g(n);var r,l,a,m,c,s=g(b.parentIdFieldId),y=g(b.postIdFieldId),p=(c=g(b.commentReplyTitleId))&&c.firstChild,u=p&&p.nextSibling;if(i&&h&&s){void 0===o&&(o=p&&p.textContent),m=h,e=b.temporaryFormId,n=g(e),c=(c=g(b.commentReplyTitleId))?c.firstChild.textContent:"",n||((n=E.createElement("div")).id=e,n.style.display="none",n.textContent=c,m.parentNode.insertBefore(n,m)),d&&y&&(y.value=d),s.value=t,I.style.display="",i.parentNode.insertBefore(h,i.nextSibling),p&&p.nodeType===Node.TEXT_NODE&&(u&&"A"===u.nodeName&&u.id!==b.cancelReplyId&&(u.style.display="none"),p.textContent=o),I.onclick=function(){return!1};try{for(var f=0;f<C.elements.length;f++)if(r=C.elements[f],l=!1,"getComputedStyle"in v?a=v.getComputedStyle(r):E.documentElement.currentStyle&&(a=r.currentStyle),(r.offsetWidth<=0&&r.offsetHeight<=0||"hidden"===a.visibility)&&(l=!0),"hidden"!==r.type&&!r.disabled&&!l){r.focus();break}}catch(e){}return!1}}}}(window);
--- a/public/template/default/pc/js/wp-embed.min.js
+++ b/public/template/default/pc/js/wp-embed.min.js
@ -1,2 +0,0 @@
-/*! This file is auto-generated */
-!function(c,d){"use strict";var e=!1,n=!1;if(d.querySelector)if(c.addEventListener)e=!0;if(c.wp=c.wp||{},!c.wp.receiveEmbedMessage)if(c.wp.receiveEmbedMessage=function(e){var t=e.data;if(t)if(t.secret||t.message||t.value)if(!/[^a-zA-Z0-9]/.test(t.secret)){for(var r,a,i,s=d.querySelectorAll('iframe[data-secret="'+t.secret+'"]'),n=d.querySelectorAll('blockquote[data-secret="'+t.secret+'"]'),o=0;o<n.length;o++)n[o].style.display="none";for(o=0;o<s.length;o++)if(r=s[o],e.source===r.contentWindow){if(r.removeAttribute("style"),"height"===t.message){if(1e3<(i=parseInt(t.value,10)))i=1e3;else if(~~i<200)i=200;r.height=i}if("link"===t.message)if(a=d.createElement("a"),i=d.createElement("a"),a.href=r.getAttribute("src"),i.href=t.value,i.host===a.host)if(d.activeElement===r)c.top.location.href=t.value}}},e)c.addEventListener("message",c.wp.receiveEmbedMessage,!1),d.addEventListener("DOMContentLoaded",t,!1),c.addEventListener("load",t,!1);function t(){if(!n){n=!0;for(var e,t,r=-1!==navigator.appVersion.indexOf("MSIE 10"),a=!!navigator.userAgent.match(/Trident.*rv:11\./),i=d.querySelectorAll("iframe.wp-embedded-content"),s=0;s<i.length;s++){if(!(e=i[s]).getAttribute("data-secret"))t=Math.random().toString(36).substr(2,10),e.src+="#?secret="+t,e.setAttribute("data-secret",t);if(r||a)(t=e.cloneNode(!0)).removeAttribute("security"),e.parentNode.replaceChild(t,e)}}}}(window,document);
--- a/public/template/default/pc/lib/fontawesome5/css/all.min.css
+++ b/public/template/default/pc/lib/fontawesome5/css/all.min.css
--- a/public/template/default/pc/lib/fontawesome5/css/brands.css
+++ b/public/template/default/pc/lib/fontawesome5/css/brands.css
@ -1,10 +0,0 @@
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: normal;
-  font-display: auto;
-  src: url("../webfonts/fa-brands-400.eot");
-  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
-
-.fab {
-  font-family: 'Font Awesome 5 Brands'; }
--- a/public/template/default/pc/lib/fontawesome5/css/fontawesome.css
+++ b/public/template/default/pc/lib/fontawesome5/css/fontawesome.css
--- a/public/template/default/pc/lib/fontawesome5/css/light.css
+++ b/public/template/default/pc/lib/fontawesome5/css/light.css
@ -1,11 +0,0 @@
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 300;
-  font-display: auto;
-  src: url("../webfonts/fa-light-300.eot");
-  src: url("../webfonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-light-300.woff2") format("woff2"), url("../webfonts/fa-light-300.woff") format("woff"), url("../webfonts/fa-light-300.ttf") format("truetype"), url("../webfonts/fa-light-300.svg#fontawesome") format("svg"); }
-
-.fal {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 300; }
--- a/public/template/default/pc/lib/fontawesome5/css/regular.css
+++ b/public/template/default/pc/lib/fontawesome5/css/regular.css
@ -1,11 +0,0 @@
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 400;
-  font-display: auto;
-  src: url("../webfonts/fa-regular-400.eot");
-  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
-
-.far {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 400; }
--- a/public/template/default/pc/lib/fontawesome5/css/solid.css
+++ b/public/template/default/pc/lib/fontawesome5/css/solid.css
@ -1,12 +0,0 @@
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 900;
-  font-display: auto;
-  src: url("../webfonts/fa-solid-900.eot");
-  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
-
-.fa,
-.fas {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 900; }
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.eot
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.eot
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.ttf
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.ttf
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.woff
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.woff
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.woff2
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-brands-400.woff2
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.eot
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.eot
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.svg
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.svg
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.ttf
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-light-300.ttf
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-regular-400.eot
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-regular-400.eot
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-regular-400.ttf
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-regular-400.ttf
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-solid-900.eot
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-solid-900.eot
--- a/public/template/default/pc/lib/fontawesome5/webfonts/fa-solid-900.ttf
+++ b/public/template/default/pc/lib/fontawesome5/webfonts/fa-solid-900.ttf
--- a/public/template/default/pc/lib/fontawesome5pro/webfonts/fa-brands-400.eot
+++ b/public/template/default/pc/lib/fontawesome5pro/webfonts/fa-brands-400.eot
--- a/public/template/default/pc/public/footer.html
+++ b/public/template/default/pc/public/footer.html
@ -1,7 +1,7 @@
 <footer>
 	<script>
 		console.log(
-				"\n %c CorePress主题v 5.1.1 %c by applek | www.lovestu.com",
+				"\n %c 默认主题 v1.0.0 %c by 木子的忧伤 | www.apecloud.cn",
 				"color:#fff;background:#409EFF;padding:5px 0;",
 				"color:#eee;background:#444;padding:5px 10px;"
 		);
@ -10,6 +10,7 @@
 	<div class="go-top-plane" title="返回顶部">
 		<i class="fa fa-arrow-up" aria-hidden="true"></i>
 	</div>
+	<div class="sidebarlist-main"></div>
 	<div class="footer-plane">
 		<div class="footer-container">
 			<div class="footer-left">
@ -77,7 +78,6 @@
 				</script>
 				<script type="text/javascript" src="__JS__/tools.js" id="tools-js"></script>
 				<script type="text/javascript" src="__JS__/index.js" id="index_js-js"></script>
-				<script type="text/javascript" src="__JS__/wp-embed.min.js" id="wp-embed-js"></script>
 			</div>
 		</div>
 	</div>
--- a/public/template/default/pc/public/head.html
+++ b/public/template/default/pc/public/head.html
@ -2,25 +2,32 @@
 	<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<meta name="Referrer" content="origin">
-	<style>.icon { width: 18px; height: 18px; vertical-align: -3px; fill: currentColor; overflow: hidden; }</style>
-	<style>html, body, #app { background-image: url("__IMG__/light_wool.png") !important; background-position: center center; background-attachment: fixed; }</style>
 	<link rel="icon" href="{:file_cdn(web_config('favicon'))}" type="image/x-icon">
-	<style>:root { --Maincolor: #409eff !important; --MaincolorHover: #409eff !important; --fontSelectedColor: #3390ff !important; } #nprogress .bar { background: var(--Maincolor) !important; }</style>
+	<style>:root{--Maincolor:#409eff!important;--MaincolorHover:#409eff!important;--fontSelectedColor:#3390ff!important}#nprogress .bar{background:var(--Maincolor)!important}.icon{width:18px;height:18px;vertical-align:-3px;fill:currentColor;overflow:hidden}</style>
 	<link rel="stylesheet" href="__CSS__/main-mobile.css">
 	<link rel="stylesheet" href="__LIB__/fontawesome5/css/all.min.css">
 	<link rel="stylesheet" href="__CSS__/main.css">
+	<link rel="stylesheet" id="pro_css_main-css" href="__CSS__/main-pro.css" type="text/css" media="all" />
+	<link rel="stylesheet" id="pro_main_mobile-css" href="__CSS__/main-mobile-pro.css" type="text/css" media="all" />
 	<script type="text/javascript" src="__JS__/jquery.min.js"  id="corepress_jquery-js"></script>
-	<script type="text/javascript" src="__JS__/post-content.js"></script>
 	<script type="text/javascript" src="__JS__/jquery.lazyload.min.js" id="corepress_jquery_lazyload-js"></script>
 	<script type="text/javascript" src="__JS__/qrcode.min.js" id="corepress_jquery_qrcode-js"></script>
 	<script type="text/javascript" id="tools-js-extra">
 		/* <![CDATA[ */
-		var tools = {"index":"1","page":"","post":""};
+		var tools = { index: "1", page: "", post: "" };
 		/* ]]> */
 	</script>
+	<script type='text/javascript' src='__JS__/tools.js' id='tools-js'></script>
 	<link rel="EditURI" type="application/rsd+xml" title="RSD" href="/xmlrpc.php?rsd" />
 	<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="/wlwmanifest.xml" />
 	<link rel="stylesheet" href="__LIB__/nprogress/nprogress.min.css" />
 	<script type="text/javascript" src="__LIB__/nprogress/nprogress.min.js"></script>
+	<style>
+		@media screen and (max-width: 800px) {
+			body .go-top-plane {
+				display: unset!important;
+			}
+		}
+	</style>
 	<link rel="stylesheet" href="__LIB__/swiper/swiper.min.css" />
 	<script type="text/javascript" src="__LIB__/swiper/swiper.min.js"></script>
--- a/public/template/default/pc/public/header.html
+++ b/public/template/default/pc/public/header.html
@ -1,18 +1,18 @@
 <header>
 	<div class="header-main-plane">
-		<div class="header-main container">
+		<div class="header-main container  header-main-location-left">
 			<script>
 				function openMenu() {
-					$('body').css('overflow', 'hidden');
+					$("body").css("overflow", "hidden");
 					$(".drawer-menu-plane").addClass("drawer-menu-plane-show");
 					$(".menu-plane").appendTo($(".drawer-menu-list"));
 					$(".user-menu-plane").appendTo($(".drawer-menu-list"));
-					$(".menu-item-has-children").append('<div class="m-dropdown" onclick="mobile_menuclick(event,this)" ><i class="fa fa-angle-down"></i></div>');
+					$(".menu-item-has-children").append('<div class="mobile-m-dropdown" onclick="mobile_menuclick(event,this)" ><i class="fa fa-angle-down"></i></div>');
 					$(".user-menu-main").not('.user-menu-main-notlogin').append('<div class="m-dropdown" onclick="mobile_menuclick(event,this)"><i class="fa fa-angle-down"></i></div>');
 				}

 				function closeMenu() {
-					$('body').css('overflow', 'auto');
+					$("body").css("overflow", "auto");
 					$(".drawer-menu-plane").removeClass("drawer-menu-plane-show");
 					$(".user-menu-plane").prependTo($(".header-menu"));
 					$(".menu-plane").prependTo($(".header-menu"));
@ -33,13 +33,34 @@
 			</div>
 			<div class="drawer-menu-plane">
 				<div class="drawer-menu-list">
+					<div class="menu-mobile">
+						<ul class="menu-mobile-header-list">
+							<li id="menu-item-0" class="menu-item menu-item-0"><a href="/" aria-current="page">首页</a></li>
+							{ape:channel type="all"}
+							<li id="menu-item-{$field.id}" class="menu-item {notempty name="field['child']"}menu-item-has-children{/notempty} {:IsActiveNav($cid,$field['id'])?'current-menu-item current_page_item':''} menu-item-{$field['id']}">
+							{notempty name="field['child']"}
+								<a href="#" aria-current="page">{$field['title']}</a>
+							{else /}
+								<a href="{$field['url']}" aria-current="page">{$field['title']}</a>
+							{/notempty}
+							{notempty name="field['child']"}
+							<ul class="sub-menu">
+								{ape:channel type="son" typeid="$field['id']" void="vo"}
+								<li id="menu-item-{$vo.id}" class="menu-item menu-item-{$vo.id} {:IsActiveNav($cid,$vo['id'])?'current-menu-item':''}">
+									<a title="{$vo['title']}" aria-current="page" href="{$vo['url']}" {if $vo['link_str']} target="_blank"{/if}>{$vo['title']}</a>
+								</li>
+								{/ape:channel}
+							</ul>
+							{/notempty}
+							</li>
+							{/ape:channel}
+						</ul>
 					</div>
-				<div class="drawer-menu-write" onclick="closeMenu()">
 				</div>
+				<div class="drawer-menu-write" onclick="closeMenu()"></div>
 			</div>
 			<div class="header-logo-plane">
-				<div class="header-logo">
-					<a href="/"><img src="{:file_cdn(web_config('logo'))}" alt=""></a></div>
+				<div class="header-logo"><a href="/"><img src="{:file_cdn(web_config('logo'))}" alt=""></a></div>
 			</div>
 			<div class="mobile-search-btn" onclick="openSearch()">
 				<i class="fa fa-search"></i>
@ -62,9 +83,9 @@
 				<div class="menu-plane">
 					<nav class="menu-header-plane">
 						<ul id="menu-header-list" class="menu-header-list">
-							<li id="menu-item-1" class="menu-item menu-item-1"><a href="/" aria-current="page">首页</a></li>
+							<li class="menu-item menu-item-0"><a href="/">首页</a></li>
 							{ape:channel type="all"}
-							<li id="menu-item-{$field.id}" class="menu-item {notempty name="field['child']"}menu-item-has-children{/notempty} {:IsActiveNav($cid,$field['id'])?'current-menu-item':''} menu-item-{$field['id']}">
+							<li class="menu-item {notempty name="field['child']"}menu-item-has-children{/notempty} {:IsActiveNav($cid,$field['id'])?'current-menu-item':''} menu-item-{$field['id']}">
 								{notempty name="field['child']"}
 								<a href="#" aria-current="page">{$field['title']}</a>
 								{else /}
@ -74,7 +95,7 @@
 								<ul class="sub-menu">
 									{ape:channel type="son" typeid="$field['id']" void="vo"}
 									<li id="menu-item-{$vo.id}" class="menu-item menu-item-{$vo.id} {:IsActiveNav($cid,$vo['id'])?'current-menu-item':''}">
-										<a title="{$vo['title']}" href="{$vo['url']}" aria-current="page" {if $vo['link_str']} target="_blank"{/if}>{$vo['title']}</a>
+										<a title="{$vo['title']}" href="{$vo['url']}" {if $vo['link_str']} target="_blank"{/if}>{$vo['title']}</a>
 									</li>
 									{/ape:channel}
 								</ul>
@ -89,7 +110,7 @@
 						<i class="fal fa-search"></i>
 					</div>
                    <span class="user-menu-main user-menu-main-notlogin">
-                 		<a href="login.html"><button class="login-btn-header">登录</button></a>
+                 		<a href="{:url('login')}"><button class="login-btn-header">登录</button></a>
                    </span>
 				</div>
 			</div>
				`@ -0,0 +1 @@`
				#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}