diff --git a/addons b/addons
new file mode 120000
index 00000000..d57b7579
--- /dev/null
+++ b/addons
@@ -0,0 +1 @@
+../fastadmin-freeaddons
\ No newline at end of file
diff --git a/addons/.gitkeep b/addons/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/addons/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index 9750a79e..7b2bbecf 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -81,7 +81,7 @@
-
+
{/if}
diff --git a/composer.json b/composer.json
index f37b8cc6..3dd55f07 100755
--- a/composer.json
+++ b/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",
diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js
index bea4c655..48dafeca 100644
--- a/public/assets/js/backend/addon.js
+++ b/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 () {
diff --git a/runtime/.gitkeep b/runtime/.gitkeep
deleted file mode 100644
index 8b137891..00000000
--- a/runtime/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-