更新TP5版本到5.0.24

优化后台验证码显示
pull/8/head^2
Karson 2019-01-11 16:56:37 +08:00
parent 91919dbf0b
commit 60b58cc397
6 changed files with 4 additions and 5 deletions

1
addons 120000
View File

@ -0,0 +1 @@
../fastadmin-freeaddons

View File

@ -1 +0,0 @@

View File

@ -81,7 +81,7 @@
<div class="input-group-addon"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></div>
<input type="text" name="captcha" class="form-control" placeholder="{:__('Captcha')}" data-rule="{:__('Captcha')}:required;length(4)" />
<span class="input-group-addon" style="padding:0;border:none;cursor:pointer;">
<img src="{:rtrim('__PUBLIC__', '/')}/index.php/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php/captcha?r=' + Math.random();"/>
<img src="{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/index.php?s=/captcha&r=' + Math.random();"/>
</span>
</div>
{/if}

View File

@ -16,7 +16,7 @@
],
"require": {
"php": ">=5.4.0",
"topthink/framework": "~5.0.23",
"topthink/framework": "~5.0.24",
"overtrue/wechat": "~3.1",
"endroid/qr-code": "^1.9",
"topthink/think-captcha": "^1.0",

View File

@ -178,6 +178,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
if (!userinfo) {
Layer.open({
content: Template("logintpl", {}),
zIndex: 99,
area: ['430px', '350px'],
title: __('Login FastAdmin'),
resize: false,
@ -196,7 +197,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
Layer.closeAll();
Layer.alert(ret.msg);
}, function (data, ret) {
Layer.alert(ret.msg);
});
},
btn2: function () {

View File

@ -1 +0,0 @@