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..e4894612 100644 --- a/app/Controllers/VueController.php +++ b/app/Controllers/VueController.php @@ -21,6 +21,8 @@ use App\Utils\TelegramProcess; use App\Utils\Spay_tool; use App\Utils\Geetest; +use voku\helper\AntiXSS; + class VueController extends BaseController { private $user; @@ -64,7 +66,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 +75,8 @@ class VueController extends BaseController { "appName" => Config::get('appName'), "dateY" => date("Y"), "isLogin" => $user->isLogin, + "enable_telegram" => Config::get('enable_telegram'), + "enable_crisp" => Config::get('enable_crisp'), ); $res['ret'] = 1; diff --git a/config/.config.php.example b/config/.config.php.example index d410d2db..8c6ae725 100755 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -115,7 +115,7 @@ $System_Config['account_expire_delete_days']='-1'; //账户到期几天之后 $System_Config['enable_kill']='true'; //是否允许用户注销账户 $System_Config['notify_limit_mode'] = 'false'; //false为关闭,per为按照百分比提醒,mb为按照固定剩余流量提醒 $System_Config['notify_limit_value'] = '20'; //当上一项为per时,此处填写百分比;当上一项为mb时,此处填写流量 -$System_Config['mergeSub'] = false; //合并订阅设置 可选项 false / true +$System_Config['mergeSub'] = 'false'; //合并订阅设置 可选项 false / true //Telegram bot设置------------------------------------------------------------------------------------ diff --git a/config/routes.php b/config/routes.php index afad31e2..7e6626c9 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..d3f139f9 100755 --- a/public/theme/material/css/index.css +++ b/public/theme/material/css/index.css @@ -19,6 +19,10 @@ a { justify-content: space-around; } +.space-between { + justify-content: space-between; +} + .align-center { align-items: center; } @@ -27,6 +31,10 @@ a { flex-wrap: wrap; } +.text-left { + text-align: left; +} + [v-cloak] { display: none; } @@ -39,6 +47,7 @@ a { .loading { position: fixed; + top: 0; text-align: center; width: 100%; height: 100%; @@ -94,6 +103,7 @@ a { .main { text-align: center; min-height: 80vh; + padding: 1.5rem 0 2.5rem 0; } .title, @@ -193,7 +203,7 @@ input.checkbox { border: 1px solid transparent; min-height: 46px; margin-top: 1rem; - width: 32%; + width: 81%; } .auth-submit:hover, @@ -210,6 +220,11 @@ input.checkbox { .auth h1 { font-size: 3.5rem; + margin-top: 0; +} + +.auth h3 { + margin: 0; } .page-auth, @@ -219,6 +234,10 @@ input.checkbox { position: relative; } +.page-auth { + min-height: 450px; +} + .input-control { justify-content: center; flex-wrap: wrap; @@ -278,10 +297,17 @@ select { justify-content: flex-start; align-items: center; margin-bottom: 1rem; - color: white; opacity: .5; } +.button-round .fa-inverse { + color: black; +} + +.button-round .fa-stack { + margin-right: .4rem; +} + .button-round:hover, .button-round:focus { opacity: 1; @@ -295,23 +321,8 @@ select { height: 2rem; display: inline-block; margin-right: .75rem; -} - -.fa { - position: relative; -} - -.icon-round .fa-pencil { - top: .25rem; - left: .05rem -} - -.icon-round .fa-plus { - top: .35em; -} - -.icon-round .fa-gear { - top: .3rem; + line-height: 2rem; + padding-left: .1rem; } #embed-captcha-reg { @@ -330,7 +341,57 @@ 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; +} + +.auth-submit.tg-timeout { + width: 80%; +} + +.qr-center img { + width: 70%; + height: 70%; + text-align: center; +} + +#register { + margin-top: 2rem; +} +#embed-captcha-reg { + min-height: 44px; +} +#embed-captcha-reg .geetest_btn { + margin-left: auto; + margin-right: auto; + width: 87%; +} + +.auth-tg { + margin-top: 2rem; +} +.auth-tg p { + padding: 0 2rem; +} +.auth-tg p a { + color: #D1335B; +} + @media screen and (min-width:35.5em) { + .auth-tg { + margin-top: 0; + } .auth-sm a { min-width: 120px; } @@ -361,6 +422,10 @@ select { text-align: right; } + .auth-submit { + width: 32%; + } + .auth-links { padding: 0; } @@ -376,6 +441,14 @@ select { .auth>div:first-of-type { padding: 0 0 0 5%; } + + .usrcenter { + padding: 0 5rem; + } + + .enableCrisp { + padding-right: 3rem; + } } @media screen and (min-width:48em) { @@ -383,10 +456,6 @@ select { font-size: 5rem; } - #register { - margin-top: 2rem; - } - .twin { justify-content: space-around; align-items: flex-end; @@ -547,4 +616,55 @@ input[type=checkbox].uim-checkbox { transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); } -} \ No newline at end of file +} + +.spinnercube { + margin: 100px auto; + width: 32px; + height: 32px; + position: relative; + transition: all .3s; + } + + .cube1, .cube2 { + background-color: white; + width: 30px; + height: 30px; + position: absolute; + top: 0; + left: 0; + + -webkit-animation: cubemove 1.8s infinite ease-in-out; + animation: cubemove 1.8s infinite ease-in-out; + } + + .cube2 { + -webkit-animation-delay: -0.9s; + animation-delay: -0.9s; + } + + @-webkit-keyframes cubemove { + 25% { -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5) } + 50% { -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg) } + 75% { -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5) } + 100% { -webkit-transform: rotate(-360deg) } + } + + @keyframes cubemove { + 25% { + transform: translateX(42px) rotate(-90deg) scale(0.5); + -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5); + } 50% { + transform: translateX(42px) translateY(42px) rotate(-179deg); + -webkit-transform: translateX(42px) translateY(42px) rotate(-179deg); + } 50.1% { + transform: translateX(42px) translateY(42px) rotate(-180deg); + -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg); + } 75% { + transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5); + -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5); + } 100% { + transform: rotate(-360deg); + -webkit-transform: rotate(-360deg); + } + } 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 fa95cea1..b6a0b8fc 100755 --- a/resources/views/material/index.tpl +++ b/resources/views/material/index.tpl @@ -7,24 +7,37 @@ + {$config["appName"]} - {$config["appName"]} + {if $config["enable_crisp"] == 'true'} + + {/if} @@ -85,7 +98,7 @@ @@ -101,20 +114,87 @@ {if $recaptcha_sitekey != null} {/if} - - - - + + + + {if isset($geetest_html)} {/if} - + {if $config['enable_telegram'] == 'true'} + + {/if}