diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php index 2982d29f..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; @@ -74,6 +76,7 @@ class VueController extends BaseController { "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/public/theme/material/css/index.css b/public/theme/material/css/index.css index 46fc0e9a..d3f139f9 100755 --- a/public/theme/material/css/index.css +++ b/public/theme/material/css/index.css @@ -31,6 +31,10 @@ a { flex-wrap: wrap; } +.text-left { + text-align: left; +} + [v-cloak] { display: none; } @@ -43,6 +47,7 @@ a { .loading { position: fixed; + top: 0; text-align: center; width: 100%; height: 100%; @@ -229,6 +234,10 @@ input.checkbox { position: relative; } +.page-auth { + min-height: 450px; +} + .input-control { justify-content: center; flex-wrap: wrap; @@ -360,7 +369,9 @@ select { #register { margin-top: 2rem; } - +#embed-captcha-reg { + min-height: 44px; +} #embed-captcha-reg .geetest_btn { margin-left: auto; margin-right: auto; @@ -430,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) { @@ -597,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/index.tpl b/resources/views/material/index.tpl index bfa78f8d..00a3409a 100755 --- a/resources/views/material/index.tpl +++ b/resources/views/material/index.tpl @@ -12,19 +12,32 @@
filter_4 备用导入节点方法:点击复制how_to_vote普通端口链接或者how_to_vote单端口多用户链接,然后右键小飞机->从剪贴板复制地址