Merge pull request #17 from Anankke/dev

merge
ximliu · Jan 24, 2019 · b48eb0c · b48eb0c
2 parents 9ddfa1a + 543f8ae
commit b48eb0c
Show file tree

Hide file tree

Showing 4 changed files with 204 additions and 67 deletions.
diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
@@ -185,12 +185,18 @@ public function getUserShops($request, $response, $args)
         return $response->getBody()->write(json_encode($res));
     }
 
-    public function getCredit($request, $response, $args)
+    public function getAllResourse($request, $response, $args)
     {
         $user = $this->user;
 
-        $res['arr'] = array(
-            'credit' => $user->money,
+        $res['resourse'] = array(
+            "money" => $user->money,
+            "class" => $user->class,
+            "class_expire" => $user->class_expire,
+            "expire_in" => $user->expire_in,
+            "online_ip_count" => $user->online_ip_count(),
+            "node_speedlimit" => $user->node_speedlimit,
+            "node_connector" => $user->node_connector,
         );
         $res['ret'] = 1;
 

diff --git a/config/routes.php b/config/routes.php
@@ -375,7 +375,7 @@
 $app->get('/getuserinfo', 'App\Controllers\VueController:getUserInfo');
 $app->get('/getuserinviteinfo', 'App\Controllers\VueController:getUserInviteInfo');
 $app->get('/getusershops', 'App\Controllers\VueController:getUserShops');
-$app->get('/getcredit', 'App\Controllers\VueController:getCredit');
+$app->get('/getallresourse', 'App\Controllers\VueController:getAllResourse');
 $app->get('/getnewsubtoken', 'App\Controllers\VueController:getNewSubToken');
 $app->get('/getnewinvotecode', 'App\Controllers\VueController:getNewInviteCode');
 

diff --git a/public/theme/material/css/index.css b/public/theme/material/css/index.css
@@ -57,10 +57,6 @@ a {
     color: #D1335B;
 }
 
-.margin-nobottom {
-    margin-bottom: 0 !important;
-}
-
 .relative {
     position: relative;
 }
@@ -69,6 +65,10 @@ a {
     display: none;
 }
 
+.margin-nobottom {
+    margin-bottom: 0 !important;
+}
+
 .nav,
 .main,
 .footer {
@@ -305,6 +305,10 @@ button.tips:disabled {
     width: 100%;
 }
 
+.user {
+    padding: 0 .5rem;
+}
+
 .auth h1 {
     font-size: 3.5rem;
     margin-top: 0;
@@ -491,6 +495,11 @@ select {
     margin-bottom: 1.5rem;
 }
 
+.user-btngroup a,
+.user-btngroup button {
+    min-width: 120px;
+}
+
 .card:hover,
 .list-shop:hover {
     border: 1px solid white;
@@ -567,6 +576,10 @@ select {
     color: #D1335B;
 }
 
+.font-gold-trans {
+    color: #faad14;
+}
+
 button.tips {
     background-color: transparent;
 }
@@ -765,6 +778,10 @@ button[name=reset] {
 }
 
 @media screen and (min-width:35.5em) {
+    .user {
+        padding: 0;
+    }
+
     .auth-tg {
         margin-top: 0;
     }
@@ -845,6 +862,10 @@ button[name=reset] {
         margin-bottom: .5rem;
         margin-left: .75rem;
     }
+
+    .margin-nobottom-sm {
+        margin-bottom: 0 !important;
+    }
 }
 
 @media screen and (min-width:48em) {
@@ -980,6 +1001,7 @@ input[type=checkbox].uim-checkbox {
 
 .uim-dropdown {
     position: relative;
+    display: inline-block;
 }
 
 .uim-dropdown-menu {
@@ -1248,6 +1270,56 @@ button.uim-modal-confirm {
     border-radius: 0 0 12px 12px;
 }
 
+/* progressbar */
+
+.uim-progressbar-inner,
+.uim-progressbar-progress,
+.uim-progressbar-progress:before {
+    display: inline-block;
+    height: 10px;
+    width: 100%;
+    background-color: #434857;
+    border-radius: 5px;
+    position: relative;
+}
+
+.uim-progressbar-progress,
+.uim-progressbar-progress:before {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 50%;
+    z-index: 3
+}
+
+.uim-progressbar-progress:before {
+    content: "";
+    opacity: 0;
+    width: unset;
+    z-index: 4;
+    background-color: #fff;
+    border-radius: 5px;
+    -webkit-animation: uim-progress-active 2s ease-in-out infinite;
+    animation: uim-progress-active 2s ease-in-out infinite;
+}
+
+.uim-progressbar .uim-progressbar-blue {
+    background-color: #2d8cf0;
+    box-shadow: 0 0 7px 0 #13c2c2;
+}
+
+@keyframes uim-progress-active {
+    from {
+        opacity: .3;
+        width: 0
+    }
+
+    to {
+        opacity: 0;
+        width: 100%
+    }
+}
+
 /* loading 动画 */
 .spinner {
     width: 60px;