diff --git a/.gitignore b/.gitignore index c7f0ca4..b67d79c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,7 @@ /.idea /.vscode /.gitee -/vendor/* *.log /.env -/public/storage/* -/runtime /public/.user.ini -/public/backup/* /config/install.lock diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index 7011208..0892e42 100644 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -111,10 +111,13 @@ class Slide extends BaseController { $param = get_params(); $where = array(); - $where[] = ['slide_id','=',$param['id']]; + $where[] = ['s.slide_id','=',$param['id']]; $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; $slideInfoList = SlideInfo::where($where) - ->order('sort desc, id desc') + ->alias('s') + ->join('file f', 's.img=f.id', 'LEFT') + ->field('s.*,f.filepath') + ->order('s.sort desc, s.id desc') ->paginate($rows, false, ['query' => $param]); return table_assign(1, '', $slideInfoList); } diff --git a/app/admin/view/conf/email.html b/app/admin/view/conf/email.html index fb6f539..6dbfd17 100644 --- a/app/admin/view/conf/email.html +++ b/app/admin/view/conf/email.html @@ -68,8 +68,9 @@
+ - 发送测试 +
{/block} @@ -102,7 +103,7 @@ return false; }); - $('#emailto').click(function () { + $('.body-content').on('click', '[lay-event="email"]', function () { layer.prompt({ formType: 0, value: '', @@ -131,6 +132,11 @@ }) }); }) + //监听返回 + $('.body-content').on('click', '[lay-event="back"]', function () { + history.back(-1); + return false; + }); } diff --git a/app/admin/view/conf/other.html b/app/admin/view/conf/other.html index df1092a..c5c6242 100644 --- a/app/admin/view/conf/other.html +++ b/app/admin/view/conf/other.html @@ -23,6 +23,7 @@
+
{/block} @@ -57,6 +58,11 @@ }) return false; }); + //监听返回 + $('.body-content').on('click', '[lay-event="back"]', function () { + history.back(-1); + return false; + }); } {include file="common/layui" base='base' extend="[]" use="['form']" callback="init" /} diff --git a/app/admin/view/conf/web.html b/app/admin/view/conf/web.html index 2819ad0..dcd2cdd 100644 --- a/app/admin/view/conf/web.html +++ b/app/admin/view/conf/web.html @@ -83,6 +83,7 @@
+
{/block} @@ -135,6 +136,11 @@ }) return false; }); + //监听返回 + $('.body-content').on('click', '[lay-event="back"]', function () { + history.back(-1); + return false; + }); } {include file="common/layui" base='base' extend="[]" use="['upload','form']" callback="init" /} diff --git a/app/admin/view/conf/wechat.html b/app/admin/view/conf/wechat.html index ad67c44..09e8766 100644 --- a/app/admin/view/conf/wechat.html +++ b/app/admin/view/conf/wechat.html @@ -5,52 +5,63 @@

微信配置

- + - + - + - + - + - + - + - + + + + + + +
token*token* 登录回调地址*登录回调地址*
appid*公众号appid* appsecret*公众号appsecret*
支付商户号支付商户号 支付API密钥支付API密钥
支付证书路径支付证书路径 支付回调地址支付回调地址
小程序appid* + + 小程序appsecret* + +
+
{/block} @@ -85,6 +96,11 @@ }) return false; }); + //监听返回 + $('.body-content').on('click', '[lay-event="back"]', function () { + history.back(-1); + return false; + }); } {include file="common/layui" base='base' extend="[]" use="['upload','form']" callback="init" /} diff --git a/app/admin/view/slide/slide_info.html b/app/admin/view/slide/slide_info.html index aba5e04..f9d2f27 100644 --- a/app/admin/view/slide/slide_info.html +++ b/app/admin/view/slide/slide_info.html @@ -51,11 +51,21 @@ }, { field: 'sort', title: '排序', + align: 'center', width: 80 }, { field: 'title', title: '标题', width: 300 + }, { + field: 'img', + title: '图片', + width: 136, + align: 'center', + templet:function(d){ + var html=''; + return html; + } }, { field: 'desc', title: '描述' diff --git a/app/admin/view/slide/slide_info_add.html b/app/admin/view/slide/slide_info_add.html index 12c123b..28b6623 100644 --- a/app/admin/view/slide/slide_info_add.html +++ b/app/admin/view/slide/slide_info_add.html @@ -4,39 +4,33 @@
- - + - - - - - - - - + - + + + + + + - - @@ -58,6 +55,7 @@
标题* - + 标题* 排序
链接* - - - 图片 -
- -
+
图片 +
+ +
+ style="max-width: 160px;" />
状态* + 链接 +
状态* {if condition="$id eq 0"} @@ -46,11 +40,14 @@ {/if} 排序
备注* + 备注 +
+ diff --git a/app/home/middleware/Auth.php b/app/home/middleware/Auth.php index 8c542f8..21af6da 100644 --- a/app/home/middleware/Auth.php +++ b/app/home/middleware/Auth.php @@ -15,7 +15,7 @@ class Auth $action = explode('/', $pathInfo)[0]; // var_dump($pathInfo); //验证用户登录 - if ($action == 'user' || $action == 'bi') { + if ($action == 'user') { $session_user = get_config('app.session_user'); if (!Session::has($session_user)) { return $request->isAjax() ? to_assign(404, '请先登录') : redirect((string) url('/home/login/errorshow')); diff --git a/public/storage/.gitignore b/public/storage/avatars/.gitignore similarity index 100% rename from public/storage/.gitignore rename to public/storage/avatars/.gitignore diff --git a/public/storage/image/.gitignore b/public/storage/image/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/public/storage/image/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/runtime/.gitignore b/runtime/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/runtime/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/vendor/.gitignore b/vendor/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/vendor/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file