Tokumeikoi 5 years ago
parent
commit
3f2c8266de

+ 1 - 0
app/Http/Controllers/User/PlanController.php

@@ -21,6 +21,7 @@ class PlanController extends Controller
             ]);
         }
         $plan = Plan::where('show', 1)
+            ->orderBy('sort', 'ASC')
             ->get();
         return response([
             'data' => $plan

+ 1 - 1
app/Http/Controllers/User/ServerController.php

@@ -21,7 +21,7 @@ class ServerController extends Controller
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $servers = Server::where('show', 1)
-                ->orderBy('name')
+                ->orderBy('sort', 'ASC')
                 ->get();
             foreach ($servers as $item) {
                 $groupId = json_decode($item['group_id']);

+ 1 - 1
public/assets/admin/env.example.js

@@ -1,4 +1,4 @@
-window.v2board = {
+window.settings = {
   // 站点标题
   title: 'V2Board',
   // API

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


+ 1 - 1
public/assets/user/env.example.js

@@ -1,4 +1,4 @@
-window.v2board = {
+window.settings = {
   // 站点标题
   title: 'V2Board',
   // 站点描述

File diff suppressed because it is too large
+ 0 - 0
public/assets/user/umi.js


+ 1 - 1
resources/views/admin.blade.php

@@ -11,7 +11,7 @@
     <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,400i,600,700"> -->
     <script>window.routerBase = "/";</script>
     <script>
-        window.v2board = {
+        window.settings = {
             title: '{{$title}}',
             theme: {
                 sidebar: '{{$theme_sidebar}}',

+ 1 - 1
resources/views/app.blade.php

@@ -11,7 +11,7 @@
     <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,400i,600,700"> -->
     <script>window.routerBase = "/";</script>
     <script>
-        window.v2board = {
+        window.settings = {
             title: '{{$title}}',
             theme: {
                 sidebar: '{{$theme_sidebar}}',

Some files were not shown because too many files changed in this diff