diff --git a/README.md b/README.md
index 91fe0474..bb8f28b8 100644
--- a/README.md
+++ b/README.md
@@ -90,10 +90,6 @@ Wiki已经启用,欢迎为此面板维护wiki
您对我们的帮助将是支持我们做下去的动力,只需您在购买部分产品或向他人推荐产品时从我们的返利链接购买,这就是对我们很大的支持了。~~没有钱了,肯定要做啊,不做没有钱用啊,打工是不可能打工的,这辈子不可能打工的~~
-**NimaQu**
-
-- [TrimePay 签约](https://portal.trimepay.com/#/auth/register/134)
-- [Scorpioud - 圣何塞大带宽/波特兰高防 VPS](https://www.scorpioud.com)
##### dumplin
@@ -105,7 +101,7 @@ Wiki已经启用,欢迎为此面板维护wiki
- [冲上云霄云主机](http://console.soar-clouds.com/aff.php?aff=94)
- [Vultr](https://www.vultr.com/?ref=7205737)
-[Nymph 的前端课程报名](t.me/kinokonominoco)
+[laurieryayoi 的前端课程报名](https://t.me/kinokonominoco)
diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
index 79bbe755..34bc7d24 100644
--- a/app/Controllers/AuthController.php
+++ b/app/Controllers/AuthController.php
@@ -526,8 +526,8 @@ class AuthController extends BaseController
public function qrcode_check($request, $response, $args)
{
- $token = $request->getQueryParams()["token"];
- $number = $request->getQueryParams()["number"];
+ $token = $request->getParam('token');
+ $number = $request->getParam('number');
if (Config::get('enable_telegram') == 'true') {
$ret = TelegramSessionManager::check_login_session($token, $number);
diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
index 7b884b3f..2982d29f 100644
--- a/app/Controllers/VueController.php
+++ b/app/Controllers/VueController.php
@@ -64,7 +64,7 @@ class VueController extends BaseController {
"telegram_bot" => Config::get('telegram_bot'),
"enable_logincaptcha" => Config::get('enable_login_captcha'),
"enable_regcaptcha" => Config::get('enable_reg_captcha'),
- "base_url" => Config::get('enable_reg_captcha'),
+ "base_url" => Config::get('baseUrl'),
"recaptcha_sitekey" => $recaptcha_sitekey,
"captcha_provider" => Config::get('captcha_provider'),
"jump_delay" => Config::get('jump_delay'),
@@ -73,6 +73,7 @@ class VueController extends BaseController {
"appName" => Config::get('appName'),
"dateY" => date("Y"),
"isLogin" => $user->isLogin,
+ "enable_telegram" => Config::get('enable_telegram'),
);
$res['ret'] = 1;
diff --git a/config/routes.php b/config/routes.php
index 47abef72..6b59209b 100755
--- a/config/routes.php
+++ b/config/routes.php
@@ -178,7 +178,7 @@ $app->group('/payment', function () {
// Auth
$app->group('/auth', function () {
$this->get('/login', 'App\Controllers\AuthController:login');
- $this->get('/qrcode_check', 'App\Controllers\AuthController:qrcode_check');
+ $this->post('/qrcode_check', 'App\Controllers\AuthController:qrcode_check');
$this->post('/login', 'App\Controllers\AuthController:loginHandle');
$this->post('/qrcode_login', 'App\Controllers\AuthController:qrcode_loginHandle');
$this->get('/register', 'App\Controllers\AuthController:register');
diff --git a/public/theme/material/css/index.css b/public/theme/material/css/index.css
index ee8c5224..bcbceeb7 100755
--- a/public/theme/material/css/index.css
+++ b/public/theme/material/css/index.css
@@ -210,6 +210,10 @@ input.checkbox {
.auth h1 {
font-size: 3.5rem;
+ margin-top: 0;
+}
+.auth h3 {
+ margin: 0;
}
.page-auth,
@@ -330,6 +334,31 @@ select {
font-weight: bolder;
}
+.basis-max .input-control {
+ width: 100%;
+}
+
+.basis-max .auth-submit {
+ width: 80%;
+}
+
+#code_number,
+.tg-timeout {
+ padding: .6rem 1rem;
+ width: 100%;
+ font-size: 1.3em;
+}
+
+.tg-timeout {
+ width: 80%;
+}
+
+.qr-center img {
+ width: 70%;
+ height: 70%;
+ text-align: center;
+}
+
@media screen and (min-width:35.5em) {
.auth-sm a {
min-width: 120px;
diff --git a/resources/views/material/auth/login.tpl b/resources/views/material/auth/login.tpl
index c2406c5b..057f5283 100755
--- a/resources/views/material/auth/login.tpl
+++ b/resources/views/material/auth/login.tpl
@@ -243,7 +243,7 @@
);
function f() {
$.ajax({
- type: "GET",
+ type: "POST",
url: "qrcode_check",
dataType: "json",
data: {
diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl
index 74538e79..efbe811a 100755
--- a/resources/views/material/index.tpl
+++ b/resources/views/material/index.tpl
@@ -108,7 +108,9 @@
{if isset($geetest_html)}
{/if}
-
+ {if $config['enable_telegram'] == 'true'}
+
+ {/if}