diff --git a/.gitignore b/.gitignore index bf8f1d9..2cb1a2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /.idea /.vscode /vendor -/runtime +/runtime/* *.log diff --git a/app/admin/controller/ArticlesController.php b/app/admin/controller/ArticlesController.php index bcdee73..bccea01 100644 --- a/app/admin/controller/ArticlesController.php +++ b/app/admin/controller/ArticlesController.php @@ -8,7 +8,7 @@ use app\admin\model\Article\ArticlesCategory; use think\facade\Db; use think\facade\View; use think\facade\Request; -use app\admin\controller\Log; +use app\admin\controller\LogController as Log; use app\admin\controller\BaseController; class ArticlesController extends BaseController diff --git a/app/admin/view/articles/articlecate.php b/app/admin/view/articles/articlecate.php index 80fb21d..7139c16 100644 --- a/app/admin/view/articles/articlecate.php +++ b/app/admin/view/articles/articlecate.php @@ -456,13 +456,13 @@ // 初始化上传组件 upload.render({ elem: '#uploadImage', - url: '/admin/upload/image', + url: '/admin/index/upload_img', accept: 'images', acceptMime: 'image/*', done: function (res) { if (res.code === 0) { - $('#uploadPreview').removeClass('layui-hide').find('img').attr('src', res.data.url); - $('#imageInput').val(res.data.url); + $('#uploadPreview').removeClass('layui-hide').find('img').attr('src', typeof res.data === 'object' ? res.data.url : res.data); + $('#imageInput').val(typeof res.data === 'object' ? res.data : res.data); layer.msg('上传成功'); } else { layer.msg('上传失败'); diff --git a/app/index/view/component/header-simple.php b/app/index/view/component/header-simple.php index 1207f0c..a0d6446 100644 --- a/app/index/view/component/header-simple.php +++ b/app/index/view/component/header-simple.php @@ -28,7 +28,7 @@