diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php index 018ed6a6..c6c842d8 100644 --- a/app/Controllers/VueController.php +++ b/app/Controllers/VueController.php @@ -26,6 +26,8 @@ use App\Utils\Geetest; use voku\helper\AntiXSS; use App\Utils\URL; +use App\Models\Ip; +use App\Models\Node; class VueController extends BaseController { @@ -119,6 +121,7 @@ class VueController extends BaseController { $mergeSub = Config::get('mergeSub'); $subUrl = Config::get('subUrl'); $baseUrl = Config::get('baseUrl'); + $user['online_ip_count'] = $user->online_ip_count(); $res['info'] = array( "user" => $user, @@ -228,4 +231,5 @@ class VueController extends BaseController { return $response->getBody()->write(json_encode($res)); } + } \ No newline at end of file diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl index b498d17c..8aab0558 100755 --- a/resources/views/material/index.tpl +++ b/resources/views/material/index.tpl @@ -288,7 +288,7 @@ const UserTmp = { SET_USERSETTINGS (state,config) { state.userSettings.resourse[0].content = config.class_expire; state.userSettings.resourse[1].content = config.expire_in; - state.userSettings.resourse[2].content = config.node_connector; + state.userSettings.resourse[2].content = config.online_ip_count; state.userSettings.resourse[3].content = config.node_speedlimit; state.userSettings.tipsLink[0].content = config.port; state.userSettings.tipsLink[1].content = config.passwd; @@ -1666,15 +1666,17 @@ const UserResourse = { for (let i=0;i 315360000000) { + this.setReasourse({ index:0,content:'无限期' }); + } else { + this.setReasourse({ index:0,content:levelExpireDays }); + } + if (accountExpireDays < 0 || accountExpireDays > 315360000000) { + this.setReasourse({ index:1,content:'无限期' }); + } else { + this.setReasourse({ index:1,content:accountExpireDays }); + } + }, }, created() { }, mounted() { - + let resourse = this.userSettings.resourse; + this.calcExpireDays(resourse[0].content,resourse[1].content); } }; @@ -1862,7 +1888,9 @@ const Panel = { + +