From 745e59664b4606d8b8cf995ec7822ced11a9776d Mon Sep 17 00:00:00 2001
From: CGDF <17256673+CGDF-Github@users.noreply.github.com>
Date: Wed, 16 Jan 2019 14:11:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?config=E5=BC=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/.config.php.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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设置------------------------------------------------------------------------------------
From 259bed97724bc89802a2e1a01a04881604460879 Mon Sep 17 00:00:00 2001
From: CGDF <17256673+CGDF-Github@users.noreply.github.com>
Date: Wed, 16 Jan 2019 14:29:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/material/user/index.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl
index 1f2785e1..25eb3bc0 100644
--- a/resources/views/material/user/index.tpl
+++ b/resources/views/material/user/index.tpl
@@ -229,7 +229,7 @@
filter_4 备用导入节点方法:点击复制how_to_vote普通端口链接或者how_to_vote单端口多用户链接,然后右键小飞机->从剪贴板复制地址
flash_auto {if !$mergeSub}普通节点{/if}订阅地址:
-
+
{if !$mergeSub}
flash_auto 单端口节点订阅地址:
From 8434f1ff421515232735627964c45bd472eff088 Mon Sep 17 00:00:00 2001
From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com>
Date: Wed, 16 Jan 2019 14:49:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=97=A0=E6=95=88?=
=?UTF-8?q?&=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Controllers/VueController.php | 2 +
public/theme/material/css/index.css | 70 ++++++++++++++++++++++++++++-
resources/views/material/index.tpl | 58 +++++++++++++++++++-----
3 files changed, 117 insertions(+), 13 deletions(-)
diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
index 2982d29f..c0332135 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;
diff --git a/public/theme/material/css/index.css b/public/theme/material/css/index.css
index 46fc0e9a..933ecbb8 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,10 @@ select {
.auth>div:first-of-type {
padding: 0 0 0 5%;
}
+
+ .usrcenter {
+ padding: 0 5rem;
+ }
}
@media screen and (min-width:48em) {
@@ -597,4 +612,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);
+ }
+ }
\ No newline at end of file
diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl
index 6e8f3348..44c81854 100755
--- a/resources/views/material/index.tpl
+++ b/resources/views/material/index.tpl
@@ -15,16 +15,20 @@
@@ -656,6 +660,10 @@ const Register = {
icon: '',
};
+ if (this.globalConfig.isEmailVeryify === 'true') {
+ ajaxCon.emailcode = this.email_code;
+ }
+
if (this.globalConfig.registMode !== 'invite') {
ajaxCon.code = 0;
if ((this.getCookie('code'))!='') {
@@ -830,7 +838,7 @@ const Reset = {
@@ -890,18 +898,46 @@ const Panel = {
delimiters: ['$[',']$'],
template: /*html*/ `
-
用户页面demo
-
进入用户中心
+
USERCENTER
+
+ USERCENTER
+
+
+
+
+
`,
props: ['routermsg'],
+ data: function() {
+ return {
+ userLoadState: 'beforeload',
+ userCon: '',
+ }
+ },
mounted() {
+ let self = this;
+ this.userLoadState = 'loading';
axios.get('/user/getuserinfo')
- .then((r)=>{
- if (r.data.ret === 1) {
- console.log(r.data.info);
- }
- });
+ .then((r)=>{
+ if (r.data.ret === 1) {
+ console.log(r.data.info);
+ this.userCon = r.data.info.user;
+ console.log(this.userCon);
+ }
+ }).then(r=>{
+ setTimeout(()=>{
+ self.userLoadState = 'loaded';
+ },1000)
+ });
},
beforeRouteLeave (to, from, next) {
if (to.matched.some(function(record) {
From ef7d058adb06c1a71f7e25567a216ad909b86643 Mon Sep 17 00:00:00 2001
From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com>
Date: Wed, 16 Jan 2019 19:06:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0crisp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Controllers/VueController.php | 1 +
public/theme/material/css/index.css | 6 +++++-
resources/views/material/index.tpl | 15 +++++++++++++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
index c0332135..e4894612 100644
--- a/app/Controllers/VueController.php
+++ b/app/Controllers/VueController.php
@@ -76,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/public/theme/material/css/index.css b/public/theme/material/css/index.css
index 933ecbb8..d3f139f9 100755
--- a/public/theme/material/css/index.css
+++ b/public/theme/material/css/index.css
@@ -445,6 +445,10 @@ select {
.usrcenter {
padding: 0 5rem;
}
+
+ .enableCrisp {
+ padding-right: 3rem;
+ }
}
@media screen and (min-width:48em) {
@@ -663,4 +667,4 @@ input[type=checkbox].uim-checkbox {
transform: rotate(-360deg);
-webkit-transform: rotate(-360deg);
}
- }
\ No newline at end of file
+ }
diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl
index 1835da5a..68173662 100755
--- a/resources/views/material/index.tpl
+++ b/resources/views/material/index.tpl
@@ -12,6 +12,15 @@
Document
+ {if $config["enable_crisp"] == 'true'}
+
+ {/if}