Browse Source

更新TP5版本到5.0.24
优化后台验证码显示

Karson 6 years ago
parent
commit
60b58cc397
6 changed files with 4 additions and 5 deletions
  1. 1 0
      addons
  2. 0 1
      addons/.gitkeep
  3. 1 1
      application/admin/view/index/login.html
  4. 1 1
      composer.json
  5. 1 1
      public/assets/js/backend/addon.js
  6. 0 1
      runtime/.gitkeep

+ 1 - 0
addons

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

+ 0 - 1
addons/.gitkeep

@@ -1 +0,0 @@
-

+ 1 - 1
application/admin/view/index/login.html

@@ -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}

+ 1 - 1
composer.json

@@ -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",

+ 1 - 1
public/assets/js/backend/addon.js

@@ -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 () {

+ 0 - 1
runtime/.gitkeep

@@ -1 +0,0 @@
-