From f061c4f8b0f89c5914fbab0ebd58b7d45daf4337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 12 Jan 2021 22:28:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9EBlog=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9B=20=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=EF=BC=9Ahttps://github.com/llldddbbb/dbblog=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84dbblog-frontend=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Modules/Blog/Config/.gitkeep              |   0
 app/Modules/Blog/Config/config.php            |   5 +
 app/Modules/Blog/Console/.gitkeep             |   0
 app/Modules/Blog/Database/Migrations/.gitkeep |   0
 app/Modules/Blog/Database/Seeders/.gitkeep    |   0
 .../Database/Seeders/BlogDatabaseSeeder.php   |  21 ++++
 app/Modules/Blog/Database/factories/.gitkeep  |   0
 app/Modules/Blog/Entities/.gitkeep            |   0
 app/Modules/Blog/Http/Controllers/.gitkeep    |   0
 .../Blog/Http/Controllers/BlogController.php  |  79 ++++++++++++
 app/Modules/Blog/Http/Middleware/.gitkeep     |   0
 app/Modules/Blog/Http/Requests/.gitkeep       |   0
 app/Modules/Blog/Providers/.gitkeep           |   0
 .../Blog/Providers/BlogServiceProvider.php    | 112 ++++++++++++++++++
 .../Blog/Providers/RouteServiceProvider.php   |  69 +++++++++++
 app/Modules/Blog/Resources/assets/.gitkeep    |   0
 app/Modules/Blog/Resources/assets/js/app.js   |   0
 .../Blog/Resources/assets/sass/app.scss       |   0
 app/Modules/Blog/Resources/lang/.gitkeep      |   0
 app/Modules/Blog/Resources/views/.gitkeep     |   0
 .../Blog/Resources/views/index.blade.php      |   9 ++
 .../Resources/views/layouts/master.blade.php  |  19 +++
 app/Modules/Blog/Routes/.gitkeep              |   0
 app/Modules/Blog/Routes/api.php               |  18 +++
 app/Modules/Blog/Routes/web.php               |  16 +++
 app/Modules/Blog/Tests/Feature/.gitkeep       |   0
 app/Modules/Blog/Tests/Unit/.gitkeep          |   0
 app/Modules/Blog/composer.json                |  23 ++++
 app/Modules/Blog/module.json                  |  13 ++
 app/Modules/Blog/package.json                 |  17 +++
 app/Modules/Blog/webpack.mix.js               |  14 +++
 modules_statuses.json                         |   3 +-
 32 files changed, 417 insertions(+), 1 deletion(-)
 create mode 100644 app/Modules/Blog/Config/.gitkeep
 create mode 100644 app/Modules/Blog/Config/config.php
 create mode 100644 app/Modules/Blog/Console/.gitkeep
 create mode 100644 app/Modules/Blog/Database/Migrations/.gitkeep
 create mode 100644 app/Modules/Blog/Database/Seeders/.gitkeep
 create mode 100644 app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php
 create mode 100644 app/Modules/Blog/Database/factories/.gitkeep
 create mode 100644 app/Modules/Blog/Entities/.gitkeep
 create mode 100644 app/Modules/Blog/Http/Controllers/.gitkeep
 create mode 100644 app/Modules/Blog/Http/Controllers/BlogController.php
 create mode 100644 app/Modules/Blog/Http/Middleware/.gitkeep
 create mode 100644 app/Modules/Blog/Http/Requests/.gitkeep
 create mode 100644 app/Modules/Blog/Providers/.gitkeep
 create mode 100644 app/Modules/Blog/Providers/BlogServiceProvider.php
 create mode 100644 app/Modules/Blog/Providers/RouteServiceProvider.php
 create mode 100644 app/Modules/Blog/Resources/assets/.gitkeep
 create mode 100644 app/Modules/Blog/Resources/assets/js/app.js
 create mode 100644 app/Modules/Blog/Resources/assets/sass/app.scss
 create mode 100644 app/Modules/Blog/Resources/lang/.gitkeep
 create mode 100644 app/Modules/Blog/Resources/views/.gitkeep
 create mode 100644 app/Modules/Blog/Resources/views/index.blade.php
 create mode 100644 app/Modules/Blog/Resources/views/layouts/master.blade.php
 create mode 100644 app/Modules/Blog/Routes/.gitkeep
 create mode 100644 app/Modules/Blog/Routes/api.php
 create mode 100644 app/Modules/Blog/Routes/web.php
 create mode 100644 app/Modules/Blog/Tests/Feature/.gitkeep
 create mode 100644 app/Modules/Blog/Tests/Unit/.gitkeep
 create mode 100644 app/Modules/Blog/composer.json
 create mode 100644 app/Modules/Blog/module.json
 create mode 100644 app/Modules/Blog/package.json
 create mode 100644 app/Modules/Blog/webpack.mix.js

diff --git a/app/Modules/Blog/Config/.gitkeep b/app/Modules/Blog/Config/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Config/config.php b/app/Modules/Blog/Config/config.php
new file mode 100644
index 0000000..6d927e0
--- /dev/null
+++ b/app/Modules/Blog/Config/config.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'name' => 'Blog'
+];
diff --git a/app/Modules/Blog/Console/.gitkeep b/app/Modules/Blog/Console/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Database/Migrations/.gitkeep b/app/Modules/Blog/Database/Migrations/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Database/Seeders/.gitkeep b/app/Modules/Blog/Database/Seeders/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php b/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php
new file mode 100644
index 0000000..bd8df9b
--- /dev/null
+++ b/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Modules\Blog\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+
+class BlogDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Model::unguard();
+
+        // $this->call("OthersTableSeeder");
+    }
+}
diff --git a/app/Modules/Blog/Database/factories/.gitkeep b/app/Modules/Blog/Database/factories/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Entities/.gitkeep b/app/Modules/Blog/Entities/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Http/Controllers/.gitkeep b/app/Modules/Blog/Http/Controllers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Http/Controllers/BlogController.php b/app/Modules/Blog/Http/Controllers/BlogController.php
new file mode 100644
index 0000000..670d446
--- /dev/null
+++ b/app/Modules/Blog/Http/Controllers/BlogController.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Modules\Blog\Http\Controllers;
+
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class BlogController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     * @return Renderable
+     */
+    public function index()
+    {
+        return view('blog::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     * @return Renderable
+     */
+    public function create()
+    {
+        return view('blog::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     * @param Request $request
+     * @return Renderable
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function show($id)
+    {
+        return view('blog::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function edit($id)
+    {
+        return view('blog::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     * @param Request $request
+     * @param int $id
+     * @return Renderable
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     * @param int $id
+     * @return Renderable
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/app/Modules/Blog/Http/Middleware/.gitkeep b/app/Modules/Blog/Http/Middleware/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Http/Requests/.gitkeep b/app/Modules/Blog/Http/Requests/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Providers/.gitkeep b/app/Modules/Blog/Providers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Providers/BlogServiceProvider.php b/app/Modules/Blog/Providers/BlogServiceProvider.php
new file mode 100644
index 0000000..863b5b1
--- /dev/null
+++ b/app/Modules/Blog/Providers/BlogServiceProvider.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Modules\Blog\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Database\Eloquent\Factory;
+
+class BlogServiceProvider extends ServiceProvider
+{
+    /**
+     * @var string $moduleName
+     */
+    protected $moduleName = 'Blog';
+
+    /**
+     * @var string $moduleNameLower
+     */
+    protected $moduleNameLower = 'blog';
+
+    /**
+     * Boot the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations'));
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register config.
+     *
+     * @return void
+     */
+    protected function registerConfig()
+    {
+        $this->publishes([
+            module_path($this->moduleName, 'Config/config.php') => config_path($this->moduleNameLower . '.php'),
+        ], 'config');
+        $this->mergeConfigFrom(
+            module_path($this->moduleName, 'Config/config.php'), $this->moduleNameLower
+        );
+    }
+
+    /**
+     * Register views.
+     *
+     * @return void
+     */
+    public function registerViews()
+    {
+        $viewPath = resource_path('views/modules/' . $this->moduleNameLower);
+
+        $sourcePath = module_path($this->moduleName, 'Resources/views');
+
+        $this->publishes([
+            $sourcePath => $viewPath
+        ], ['views', $this->moduleNameLower . '-module-views']);
+
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
+    }
+
+    /**
+     * Register translations.
+     *
+     * @return void
+     */
+    public function registerTranslations()
+    {
+        $langPath = resource_path('lang/modules/' . $this->moduleNameLower);
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, $this->moduleNameLower);
+        } else {
+            $this->loadTranslationsFrom(module_path($this->moduleName, 'Resources/lang'), $this->moduleNameLower);
+        }
+    }
+
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return [];
+    }
+
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (\Config::get('view.paths') as $path) {
+            if (is_dir($path . '/modules/' . $this->moduleNameLower)) {
+                $paths[] = $path . '/modules/' . $this->moduleNameLower;
+            }
+        }
+        return $paths;
+    }
+}
diff --git a/app/Modules/Blog/Providers/RouteServiceProvider.php b/app/Modules/Blog/Providers/RouteServiceProvider.php
new file mode 100644
index 0000000..6affbbc
--- /dev/null
+++ b/app/Modules/Blog/Providers/RouteServiceProvider.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Modules\Blog\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The module namespace to assume when generating URLs to actions.
+     *
+     * @var string
+     */
+    protected $moduleNamespace = 'App\Modules\Blog\Http\Controllers';
+
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @return void
+     */
+    public function map()
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::middleware('web')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Blog', '/Routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Blog', '/Routes/api.php'));
+    }
+}
diff --git a/app/Modules/Blog/Resources/assets/.gitkeep b/app/Modules/Blog/Resources/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Resources/assets/js/app.js b/app/Modules/Blog/Resources/assets/js/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Resources/assets/sass/app.scss b/app/Modules/Blog/Resources/assets/sass/app.scss
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Resources/lang/.gitkeep b/app/Modules/Blog/Resources/lang/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Resources/views/.gitkeep b/app/Modules/Blog/Resources/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Resources/views/index.blade.php b/app/Modules/Blog/Resources/views/index.blade.php
new file mode 100644
index 0000000..cf0370e
--- /dev/null
+++ b/app/Modules/Blog/Resources/views/index.blade.php
@@ -0,0 +1,9 @@
+@extends('blog::layouts.master')
+
+@section('content')
+    <h1>Hello World</h1>
+
+    <p>
+        This view is loaded from module: {!! config('blog.name') !!}
+    </p>
+@endsection
diff --git a/app/Modules/Blog/Resources/views/layouts/master.blade.php b/app/Modules/Blog/Resources/views/layouts/master.blade.php
new file mode 100644
index 0000000..7fbe4a1
--- /dev/null
+++ b/app/Modules/Blog/Resources/views/layouts/master.blade.php
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Module Blog</title>
+
+       {{-- Laravel Mix - CSS File --}}
+       {{-- <link rel="stylesheet" href="{{ mix('css/blog.css') }}"> --}}
+
+    </head>
+    <body>
+        @yield('content')
+
+        {{-- Laravel Mix - JS File --}}
+        {{-- <script src="{{ mix('js/blog.js') }}"></script> --}}
+    </body>
+</html>
diff --git a/app/Modules/Blog/Routes/.gitkeep b/app/Modules/Blog/Routes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Routes/api.php b/app/Modules/Blog/Routes/api.php
new file mode 100644
index 0000000..dec1928
--- /dev/null
+++ b/app/Modules/Blog/Routes/api.php
@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Http\Request;
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register API routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| is assigned the "api" middleware group. Enjoy building your API!
+|
+*/
+
+Route::middleware('auth:api')->get('/blog', function (Request $request) {
+    return $request->user();
+});
\ No newline at end of file
diff --git a/app/Modules/Blog/Routes/web.php b/app/Modules/Blog/Routes/web.php
new file mode 100644
index 0000000..d4d641f
--- /dev/null
+++ b/app/Modules/Blog/Routes/web.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
+|
+*/
+
+Route::prefix('blog')->group(function() {
+    Route::get('/', 'BlogController@index');
+});
diff --git a/app/Modules/Blog/Tests/Feature/.gitkeep b/app/Modules/Blog/Tests/Feature/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/Tests/Unit/.gitkeep b/app/Modules/Blog/Tests/Unit/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/Modules/Blog/composer.json b/app/Modules/Blog/composer.json
new file mode 100644
index 0000000..dbf5e5d
--- /dev/null
+++ b/app/Modules/Blog/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "nwidart/blog",
+    "description": "",
+    "authors": [
+        {
+            "name": "Nicolas Widart",
+            "email": "n.widart@gmail.com"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\Modules\\Blog\\": ""
+        }
+    }
+}
diff --git a/app/Modules/Blog/module.json b/app/Modules/Blog/module.json
new file mode 100644
index 0000000..da7cd74
--- /dev/null
+++ b/app/Modules/Blog/module.json
@@ -0,0 +1,13 @@
+{
+    "name": "Blog",
+    "alias": "blog",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "App\\Modules\\Blog\\Providers\\BlogServiceProvider"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": []
+}
diff --git a/app/Modules/Blog/package.json b/app/Modules/Blog/package.json
new file mode 100644
index 0000000..4599509
--- /dev/null
+++ b/app/Modules/Blog/package.json
@@ -0,0 +1,17 @@
+{
+    "private": true,
+    "scripts": {
+        "dev": "npm run development",
+        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch-poll": "npm run watch -- --watch-poll",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "prod": "npm run production",
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    },
+    "devDependencies": {
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
+        "laravel-mix-merge-manifest": "^0.1.2"
+    }
+}
diff --git a/app/Modules/Blog/webpack.mix.js b/app/Modules/Blog/webpack.mix.js
new file mode 100644
index 0000000..2a6d6d7
--- /dev/null
+++ b/app/Modules/Blog/webpack.mix.js
@@ -0,0 +1,14 @@
+const dotenvExpand = require('dotenv-expand');
+dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/}));
+
+const mix = require('laravel-mix');
+require('laravel-mix-merge-manifest');
+
+mix.setPublicPath('../../public').mergeManifest();
+
+mix.js(__dirname + '/Resources/assets/js/app.js', 'js/blog.js')
+    .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/blog.css');
+
+if (mix.inProduction()) {
+    mix.version();
+}
diff --git a/modules_statuses.json b/modules_statuses.json
index 1f5f991..85c1078 100644
--- a/modules_statuses.json
+++ b/modules_statuses.json
@@ -1,3 +1,4 @@
 {
-    "Admin": true
+    "Admin": true,
+    "Blog": true
 }
\ No newline at end of file
-- 
Gitee


From b6cf2f5259cc7259c8dbf93a872baf9c8342ea45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 13 Jan 2021 18:11:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?input=E7=9A=84=E6=8E=92=E5=BA=8F=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=20=E8=AE=BE=E7=BD=AE=E7=B1=BB=E5=9E=8B=EF=BC=9Anumber?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/views/admin_menus/components/detail.vue   | 2 +-
 .../views/article_categories/components/detail.vue              | 2 +-
 .../vue-element-admin/views/banners/components/detail.vue       | 2 +-
 .../vue-element-admin/views/friendlinks/components/detail.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
index 00fa56a..328f7ad 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
@@ -47,7 +47,7 @@
                 <el-input v-model="form.api_url" autocomplete="off"></el-input>
             </el-form-item>
             <el-form-item label="排序" prop="menu_sort">
-                <el-input v-model="form.menu_sort" autocomplete="off" value="0"></el-input>
+                <el-input v-model="form.menu_sort" type="number" autocomplete="off" value="0"></el-input>
             </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
index 6ff515b..3cb8eab 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
@@ -26,7 +26,7 @@
                 <el-input v-model="form.category_name" autocomplete="off"></el-input>
             </el-form-item>
             <el-form-item label="排序" prop="category_sort">
-                <el-input v-model="form.category_sort" autocomplete="off" value="99"></el-input>
+                <el-input v-model="form.category_sort" autocomplete="off" type="number"></el-input>
             </el-form-item>
             <el-form-item label="是否启用" prop="is_check">
                 <el-radio-group v-model="form.is_check">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
index b5d31e7..f9b7315 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
@@ -40,7 +40,7 @@
                 <el-input v-model.trim="form.banner_link" autocomplete="off"/>
             </el-form-item>
             <el-form-item label="排序" prop="banner_sort">
-                <el-input v-model.trim="form.banner_sort" autocomplete="off"/>
+                <el-input v-model.trim="form.banner_sort" type="number" autocomplete="off"/>
             </el-form-item>
             <el-form-item label="是否启用" prop="is_check">
                 <el-radio-group v-model="form.is_check">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
index 4538416..1b17866 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
@@ -40,7 +40,7 @@
                 <el-input v-model.trim="form.link_url" autocomplete="off"/>
             </el-form-item>
             <el-form-item label="排序" prop="link_sort">
-                <el-input v-model.trim="form.link_sort" autocomplete="off"/>
+                <el-input v-model.trim="form.link_sort" type="number" autocomplete="off"/>
             </el-form-item>
             <el-form-item label="是否启用" prop="is_check">
                 <el-radio-group v-model="form.is_check">
-- 
Gitee


From 957fe1c0ab1da70e073df4d6972ed0afa83b4a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 13 Jan 2021 18:12:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Http=E7=B1=BB=E5=BA=93=EF=BC=9B=20=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87ffmpeg=E8=8E=B7=E5=8F=96=E8=A7=86=E9=A2=91=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E5=B8=A7=E4=BD=9C=E4=B8=BA=E5=B0=81=E9=9D=A2=E5=9B=BE?=
 =?UTF-8?q?=20=20=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helper/functions.php |  94 ++++++++
 app/Library/Http.php     | 488 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 582 insertions(+)
 create mode 100644 app/Library/Http.php

diff --git a/app/Helper/functions.php b/app/Helper/functions.php
index b3fcbbd..6148d07 100644
--- a/app/Helper/functions.php
+++ b/app/Helper/functions.php
@@ -1,5 +1,99 @@
 <?php
 
+if ( !function_exists('get_redirect_url') ) {
+    /**
+     * 通过 301/302 重定向的URL，获取原始的URL
+     * @param  string  $url
+     *
+     * @return bool|string
+     */
+    function get_redirect_url(string $url)
+    {
+        $redirect_url = null;
+
+        $url_parts = parse_url($url);
+        var_dump($url_parts);
+        if ( !$url_parts ) return false;
+        if ( !isset($url_parts['host']) ) return false; //can't process relative URLs
+        if ( !isset($url_parts['path']) ) $url_parts['path'] = '/';
+
+        $sock = fsockopen($url_parts['host'], (isset($url_parts['port']) ? (int)$url_parts['port'] : 80), $errno, $errstr, 30);
+        if ( !$sock ) return false;
+
+        $request = "HEAD " . $url_parts['path'] . (isset($url_parts['query']) ? '?' . $url_parts['query'] : '') . " HTTP/1.1\r\n";
+        $request .= 'Host: ' . $url_parts['host'] . "\r\n";
+        $request .= "Connection: Close\r\n\r\n";
+
+        fwrite($sock, $request);
+        $response = '';
+        while ( !feof($sock) ) $response .= fread($sock, 8192);
+        fclose($sock);
+
+        var_dump($response);
+
+        if ( preg_match('/^location: (.+?)$/m', $response, $matches) ) {
+            if ( substr($matches[1], 0, 1) == "/" ) return $url_parts['scheme'] . "://" . $url_parts['host'] . trim($matches[1]); else
+                return trim($matches[1]);
+        } else {
+            return false;
+        }
+    }
+}
+
+if ( !function_exists('get_cover_by_video') ) {
+    /**
+     * 通过 ffmpeg 获取视频的第一帧，存储为图片
+     *
+     * @param  string  $video_path 视频地址
+     * @param  string  $cover_file_path 图片存储地址
+     * @param          $output 检测失败与成功：0：成功；其它都为失败
+     */
+    /**
+     * @param  string  $video_path 视频地址
+     * @param  string  $cover_file_path 图片存储地址
+     * @param  null    $return_val 0.表示成功
+     * @param  null    $output
+     * @param  string  $ffmpeg_path ffmpeg的环境变量
+     */
+    function get_cover_by_video(string $video_path, string $cover_file_path, &$return_val = null, &$output = null, string $ffmpeg_path = '/usr/local/ffmpeg/bin/ffmpeg')
+    {
+        //  -s 286x160 是设置图片尺寸（放在  -f rawvideo 后面）
+        //-L license
+        //-h 帮助
+        //-fromats 显示可用的格式，编解码的，协议的...
+        //-f fmt 强迫采用格式fmt
+        //-I filename 输入文件
+        //-y 覆盖输出文件
+        //-t duration 设置纪录时间 hh:mm:ss[.xxx]格式的记录时间也支持
+        //-ss position 搜索到指定的时间 [-]hh:mm:ss[.xxx]的格式也支持
+        //-title string 设置标题
+        //-author string 设置作者
+        //-copyright string 设置版权
+        //-comment string 设置评论
+        //-b bitrate 设置比特率，缺省200kb/s
+        //-r fps 设置帧频 缺省25
+        //-s size 设置帧大小 格式为WXH 缺省160X128.下面的简写也可以直接使用：
+        //Sqcif 128X96 qcif 176X144 cif 252X288 4cif 704X576
+        //-aspect aspect 设置横纵比 4:3 16:9 或 1.3333 1.7777
+        //-croptop size 设置顶部切除带大小 像素单位
+        //-cropbottom size –cropleft size –cropright size
+        //-padtop size 设置顶部补齐的大小 像素单位
+        //-padbottom size –padleft size –padright size –padcolor color 设置补齐条颜色(hex,6个16进制的数，红:绿:兰排列，比如 000000代表黑色)
+        //-vn 不做视频记录
+        //-bt tolerance 设置视频码率容忍度kbit/s
+        //-maxrate bitrate设置最大视频码率容忍度
+        //-minrate bitreate 设置最小视频码率容忍度
+        //-bufsize size 设置码率控制缓冲区大小
+        //-vcodec codec 强制使用codec编解码方式。如果用copy表示原始编解码数据必须被拷贝。
+        //-sameq 使用同样视频质量作为源（VBR）
+        //-pass n 选择处理遍数（1或者2）。两遍编码非常有用。第一遍生成统计信息，第二遍生成精确的请求的码率
+        //-passlogfile file 选择两遍的纪录文件名为file
+        $command = $ffmpeg_path . ' -v 0 -y -i "' . $video_path . '" -vframes 1 -ss 1 -vcodec mjpeg -f rawvideo -aspect 16:9 ' . $cover_file_path . ' ';
+
+        exec($command, $output, $return_val);
+    }
+}
+
 if ( !function_exists('get_last_month') ) {
     /**
      * 是否为windows系统
diff --git a/app/Library/Http.php b/app/Library/Http.php
new file mode 100644
index 0000000..5c2e1fa
--- /dev/null
+++ b/app/Library/Http.php
@@ -0,0 +1,488 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace App\Library;
+
+class Http
+{
+    public function demo()
+    {
+        $url = '';
+        $http = new Http($url);
+        $http->setUserAgent('Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Mobile Safari/537.36 Edg/87.0.664.75');
+
+        $content = $http->fetch();
+        var_dump($content);
+        var_dump($http->getHttpCode());
+        var_dump($http->getLastError());
+    }
+
+    //Pre-defined content types
+    const CONTENT_TYPE_XML         = 'application/xml; charset=UTF-8';
+    const CONTENT_TYPE_JSON        = 'application/json; charset=UTF-8';
+    const CONTENT_TYPE_FORM_DATA   = 'multipart/form-data';
+    const CONTENT_TYPE_URL_ENCODED = 'application/x-www-form-urlencoded';
+
+    //Job info
+    public  $data   = [];
+    public  $file   = [];
+    public  $header = [];
+
+    public $url        = '';
+    public $etag       = '';
+    public  $cookie     = '';
+    public  $referer    = '';
+    public  $modified   = '';
+    public  $curl_error = '';
+
+    public  $proxy        = '';
+    public  $proxy_passwd = '';
+
+    public  $max_follow    = 0;
+    public  $response_code = 0;
+
+    public  $http_ver   = 'HTTP/2';                                               //HTTP Version
+    public  $method     = 'GET';                                                  //Request method
+    public  $user_agent = 'Mozilla/5.0 (Compatible; NervSys/111)';     //User Agent string
+    public  $connection = 'keep-alive';                                           //Connection type
+
+    public  $content_type    = self::CONTENT_TYPE_URL_ENCODED;    //Content type
+    public  $accept_charset  = 'UTF-8,*;q=0';                     //Accept charset
+    public  $accept_encoding = 'gzip,deflate,identity,*;q=0';     //Accept encoding
+    public  $accept_language = 'en-US,en,zh-CN,zh,*;q=0';         //Accept language
+
+    public  $accept_type = 'application/json;q=0.9,application/xml;q=0.8,text/plain;q=0.7,text/html;q=0.6,*/*;q=0.5'; //Accept types
+
+    /**
+     * libHttp constructor.
+     *
+     * @param string $url
+     */
+    public function __construct(string $url = '')
+    {
+        $this->url = &$url;
+        unset($url);
+    }
+
+    /**
+     * Add request data
+     *
+     * @param array ...$data
+     *
+     * @return $this
+     */
+    public function addData(array ...$data): self
+    {
+        foreach ($data as $item) {
+            $this->data += $item;
+        }
+
+        unset($data, $item);
+        return $this;
+    }
+
+    /**
+     * Add upload file
+     *
+     * @param array ...$file
+     *
+     * @return $this
+     */
+    public function addFile(array ...$file): self
+    {
+        foreach ($file as $key => $val) {
+            if (file_exists($val)) {
+                $this->file[$key] = new \CURLFile($val);
+            }
+        }
+
+        unset($file, $key, $val);
+        return $this;
+    }
+
+    /**
+     * Add header data
+     *
+     * @param array $header
+     *
+     * @return $this
+     */
+    public function addHeader(array $header): self
+    {
+        $this->header += $header;
+
+        unset($header);
+        return $this;
+    }
+
+    /**
+     * Add cookie data
+     *
+     * @param array $cookie
+     *
+     * @return $this
+     */
+    public function addCookie(array $cookie): self
+    {
+        foreach ($cookie as $key => $val) {
+            if ('' !== $this->cookie) {
+                $this->cookie .= '; ';
+            }
+
+            $this->cookie .= $key . '=' . $val;
+        }
+
+        unset($cookie, $key, $val);
+        return $this;
+    }
+
+    /**
+     * Set method
+     *
+     * @param string $method
+     *
+     * @return $this
+     */
+    public function setMethod(string $method = 'POST'): self
+    {
+        $this->method = strtoupper($method);
+
+        unset($method);
+        return $this;
+    }
+
+    /**
+     * Set content type
+     *
+     * @param string $content_type
+     *
+     * @return $this
+     */
+    public function setContentType(string $content_type = self::CONTENT_TYPE_URL_ENCODED): self
+    {
+        $this->content_type = &$content_type;
+
+        unset($content_type);
+        return $this;
+    }
+
+    /**
+     * Set referer URL
+     *
+     * @param string $referer
+     *
+     * @return $this
+     */
+    public function setReferer(string $referer): self
+    {
+        $this->referer = &$referer;
+
+        unset($referer);
+        return $this;
+    }
+
+    /**
+     * Set User-Agent string
+     *
+     * @param string $user_agent
+     *
+     * @return $this
+     */
+    public function setUserAgent(string $user_agent): self
+    {
+        $this->user_agent = &$user_agent;
+
+        unset($user_agent);
+        return $this;
+    }
+
+    /**
+     * Set max follows
+     *
+     * @param int $max_follow
+     *
+     * @return $this
+     */
+    public function setMaxFollow(int $max_follow): self
+    {
+        $this->max_follow = &$max_follow;
+
+        unset($max_follow);
+        return $this;
+    }
+
+    /**
+     * Set HTTP accept types
+     *
+     * @param string $accept_type
+     *
+     * @return $this
+     */
+    public function setAcceptType(string $accept_type): self
+    {
+        $this->accept_type = &$accept_type;
+
+        unset($accept_type);
+        return $this;
+    }
+
+    /**
+     * Set ETag value
+     *
+     * @param string $etag
+     *
+     * @return $this
+     */
+    public function setETag(string $etag): self
+    {
+        $this->etag = &$etag;
+
+        unset($etag);
+        return $this;
+    }
+
+    /**
+     * Set modified since value
+     *
+     * @param string $last_modified
+     *
+     * @return $this
+     */
+    public function setLastModified(string $last_modified): self
+    {
+        $this->modified = &$last_modified;
+
+        unset($last_modified);
+        return $this;
+    }
+
+    /**
+     * Set proxy
+     *
+     * @param string $proxy
+     * @param string $proxy_passwd
+     *
+     * @return $this
+     */
+    public function setProxy(string $proxy, string $proxy_passwd): self
+    {
+        $this->proxy        = &$proxy;
+        $this->proxy_passwd = &$proxy_passwd;
+
+        unset($proxy, $proxy_passwd);
+        return $this;
+    }
+
+    /**
+     * Fetch response data
+     *
+     * @param bool $with_body
+     * @param bool $with_header
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function fetch(bool $with_body = true, bool $with_header = false): string
+    {
+        if ('' === $this->url) {
+            throw new \Exception('URL not set!', E_USER_NOTICE);
+        }
+
+        //Prepare data
+        if (!empty($this->file)) {
+            $this->data         += $this->file;
+            $this->content_type = self::CONTENT_TYPE_FORM_DATA;
+        }
+
+        //Set method
+        if (!empty($this->data)) {
+            $this->method = 'POST';
+        }
+
+        //Get URL units
+        $url_unit = $this->getUrlUnit($this->url);
+
+        //Get cURL headers
+        $header = $this->getHeader($url_unit);
+
+        //Initialize
+        $opt  = [];
+        $curl = curl_init();
+
+        //Build options
+        $opt[CURLOPT_URL]            = $this->url;
+        $opt[CURLOPT_PORT]           = &$url_unit['port'];
+        $opt[CURLOPT_TIMEOUT]        = 60;
+        $opt[CURLOPT_NOSIGNAL]       = true;
+        $opt[CURLOPT_AUTOREFERER]    = true;
+        $opt[CURLOPT_COOKIESESSION]  = true;
+        $opt[CURLOPT_RETURNTRANSFER] = true;
+        $opt[CURLOPT_SSL_VERIFYHOST] = 2;
+        $opt[CURLOPT_SSL_VERIFYPEER] = false;
+        $opt[CURLOPT_HTTPHEADER]     = &$header;
+        $opt[CURLOPT_ENCODING]       = $this->accept_encoding;
+        $opt[CURLOPT_USERAGENT]      = $this->user_agent;
+        $opt[CURLOPT_CUSTOMREQUEST]  = strtoupper($this->method);
+        $opt[CURLOPT_POST]           = ('POST' === $this->method);
+        $opt[CURLOPT_NOBODY]         = !$with_body;
+        $opt[CURLOPT_HEADER]         = &$with_header;
+
+        if ('' !== $this->cookie) {
+            $opt[CURLOPT_COOKIE] = $this->cookie;
+        }
+
+        if ('' !== $this->referer) {
+            $opt[CURLOPT_REFERER] = $this->referer;
+        }
+
+        if (0 < $this->max_follow) {
+            $opt[CURLOPT_FOLLOWLOCATION] = true;
+            $opt[CURLOPT_MAXREDIRS]      = $this->max_follow;
+        }
+
+        if ('' !== $this->proxy) {
+            $opt[CURLOPT_PROXY] = $this->proxy;
+
+            if ('' !== $this->proxy_passwd) {
+                $opt[CURLOPT_PROXYUSERPWD] = $this->proxy_passwd;
+            }
+        }
+
+        if (!empty($this->data)) {
+            switch ($this->content_type) {
+                case self::CONTENT_TYPE_JSON:
+                    $opt[CURLOPT_POSTFIELDS] = json_encode($this->data);
+                    break;
+
+                case self::CONTENT_TYPE_XML:
+                    $opt[CURLOPT_POSTFIELDS] = IOUnit::new()->toXml($this->data);
+                    break;
+
+                case self::CONTENT_TYPE_URL_ENCODED:
+                    $opt[CURLOPT_POSTFIELDS] = http_build_query($this->data);
+                    break;
+
+                default:
+                    $opt[CURLOPT_POSTFIELDS] = &$this->data;
+                    break;
+            }
+        }
+
+        //Set cURL options
+        curl_setopt_array($curl, $opt);
+
+        //Get response
+        $response = curl_exec($curl);
+
+        //Collect HTTP CODE or ERROR
+        false !== $response
+            ? $this->response_code = curl_getinfo($curl, CURLINFO_RESPONSE_CODE)
+            : $this->curl_error = curl_error($curl);
+
+        //Close cURL handle
+        curl_close($curl);
+
+        unset($opt, $curl, $key, $val);
+        return (string)$response;
+    }
+
+    /**
+     * Get last HTTP response code
+     *
+     * @return string
+     */
+    public function getHttpCode()
+    {
+        return $this->response_code;
+    }
+
+    /**
+     * Get last HTTP curl error
+     *
+     * @return string
+     */
+    public function getLastError(): string
+    {
+        return $this->curl_error;
+    }
+
+    /**
+     * Extract URL units
+     *
+     * @param string $url
+     *
+     * @return array
+     */
+    private function getUrlUnit(string $url): array
+    {
+        //Parse URL
+        $unit = parse_url($url);
+
+        //Check main components
+        if (false === $unit || !isset($unit['scheme']) || !isset($unit['host'])) {
+            return [];
+        }
+
+        //Prepare URL unit
+        if (!isset($unit['path'])) {
+            $unit['path'] = '/';
+        }
+
+        $unit['query'] = isset($unit['query']) ? '?' . $unit['query'] : '';
+
+        if (!isset($unit['port'])) {
+            $unit['port'] = 'https' === $unit['scheme'] ? 443 : 80;
+        }
+
+        unset($url);
+        return $unit;
+    }
+
+    /**
+     * get request header
+     *
+     * @param array $url_unit
+     *
+     * @return array
+     */
+    private function getHeader(array $url_unit): array
+    {
+        $header_list = ['Host' => $url_unit['host'] . ':' . $url_unit['port']];
+
+        if (!empty($this->header)) {
+            $header_list += $this->header;
+        }
+
+        if ('' !== $this->cookie) {
+            $header_list['Cookie'] = $this->cookie;
+        }
+
+        if ('' !== $this->etag) {
+            $header_list['If-None-Match'] = $this->etag;
+        }
+
+        if ('' !== $this->modified) {
+            $header_list['If-Modified-Since'] = $this->modified;
+        }
+
+        $header_list += [
+            'Accept'          => $this->accept_type,
+            'Accept-Charset'  => $this->accept_charset,
+            'Accept-Encoding' => $this->accept_encoding,
+            'Accept-Language' => $this->accept_language,
+            'Content-Type'    => $this->content_type,
+            'User-Agent'      => $this->user_agent,
+            'Connection'      => $this->connection
+        ];
+
+        $headers = [$this->method . ' ' . $url_unit['path'] . $url_unit['query'] . ' ' . $this->http_ver];
+
+        foreach ($header_list as $key => $val) {
+            $headers[] = $key . ': ' . $val;
+        }
+
+        unset($url_unit, $header_list, $key, $val);
+        return $headers;
+    }
+}
-- 
Gitee


From 1e4253c96b5760ed830c0f114745cab63ae7c499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 13 Jan 2021 18:27:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?Admin=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E6=98=AF=E4=B8=8B=E8=BD=BD=E6=97=B6=EF=BC=8C=E9=82=A3=E4=B9=88?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=B0=86=E5=88=86=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Modules/Admin/Services/BaseService.php | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
index 1e97e16..891528e 100644
--- a/app/Modules/Admin/Services/BaseService.php
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -25,18 +25,22 @@ class BaseService extends Service
         if ($this->model instanceof MonthModel){
             $this->model = $this->model->setMonthTable($this->getSearchMonth());
         }
-        $lists = $this->model->where($params['where_callback'] ?? [])
+        $model = $this->model->where($params['where_callback'] ?? [])
             ->with($this->with)
-            ->orderBy(empty($params['order']) ? $this->model->getKeyName() : $params['order'], empty($params['order_sort']) ? 'DESC' : $params['order_sort'])
-            ->paginate($this->getLimit($params['limit'] ?? 10));
-
-        return [
-            'current_page' => $lists->currentPage(),
-            'per_page' => $lists->perPage(),
-            'count_page' => $lists->lastPage(),
-            'total' => $lists->total(),
-            'data' => $lists->items(),
-        ];
+            ->orderBy(empty($params['order']) ? $this->model->getKeyName() : $params['order'], empty($params['order_sort']) ? 'DESC' : $params['order_sort']);
+        // 如果是下载，那么数据将不分页。
+        if (isset($params['is_download']) && $params['is_download'] == 1){
+            return $model->get()->toArray() ?? [];
+        }else{
+            $lists = $model->paginate($this->getLimit($params['limit'] ?? 10));
+            return [
+                'current_page' => $lists->currentPage(),
+                'per_page' => $lists->perPage(),
+                'count_page' => $lists->lastPage(),
+                'total' => $lists->total(),
+                'data' => $lists->items(),
+            ];
+        }
     }
 
     /**
-- 
Gitee


From 5319067eba1a97a52da50c21600d1289dc4ce246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Thu, 14 Jan 2021 14:21:43 +0800
Subject: [PATCH 5/5] =?UTF-8?q?Admin=E6=A8=A1=E5=9D=97=EF=BC=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/utils/index.js          | 426 +++++++++---------
 .../views/admin_roles/index.vue               | 127 ++++--
 .../views/adminloginlogs/index.vue            |  10 +-
 .../views/admins/components/detail.vue        |   5 +-
 .../vue-element-admin/views/admins/index.vue  | 154 ++++---
 .../article_labels/components/detail.vue      |   1 -
 .../views/article_labels/index.vue            |   1 +
 .../articles/components/ArticleDetail.vue     |   2 +-
 .../views/articles/index.vue                  | 120 +++--
 .../views/banners/components/detail.vue       |   2 +-
 .../vue-element-admin/views/banners/index.vue | 268 ++++++-----
 .../vue-element-admin/views/configs/index.vue | 193 ++++----
 .../views/friendlinks/components/detail.vue   |   3 +-
 .../views/friendlinks/index.vue               | 251 ++++++-----
 .../views/versions/index.vue                  | 211 +++++----
 15 files changed, 995 insertions(+), 779 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/utils/index.js b/app/Modules/Admin/Resources/vue-element-admin/utils/index.js
index 9089b75..3eadf0f 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/utils/index.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/utils/index.js
@@ -9,46 +9,48 @@
  * @returns {string | null}
  */
 export function parseTime(time, cFormat) {
-  if (arguments.length === 0 || !time) {
-    return null
-  }
-  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string')) {
-      if ((/^[0-9]+$/.test(time))) {
-        // support "1548221490638"
-        time = parseInt(time)
-      } else {
-        // support safari
-        // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
-        time = time.replace(new RegExp(/-/gm), '/')
-      }
+    if (arguments.length === 0 || !time) {
+        return '';
     }
+    const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+    let date
+    if (typeof time === 'object') {
+        date = time
+    } else {
+        if ((typeof time === 'string')) {
+            if ((/^[0-9]+$/.test(time))) {
+                // support "1548221490638"
+                time = parseInt(time)
+            } else {
+                // support safari
+                // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+                time = time.replace(new RegExp(/-/gm), '/')
+            }
+        }
 
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
-      time = time * 1000
+        if ((typeof time === 'number') && (time.toString().length === 10)) {
+            time = time * 1000
+        }
+        date = new Date(time)
+    }
+    const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
     }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
-    const value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
-    return value.toString().padStart(2, '0')
-  })
-  return time_str
+    const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+        const value = formatObj[key]
+        // Note: getDay() returns 0 on Sunday
+        if (key === 'a') {
+            return ['日', '一', '二', '三', '四', '五', '六'][value]
+        }
+        return value.toString().padStart(2, '0')
+    })
+    return time_str
 }
 
 /**
@@ -57,41 +59,41 @@ export function parseTime(time, cFormat) {
  * @returns {string}
  */
 export function formatTime(time, option) {
-  if (('' + time).length === 10) {
-    time = parseInt(time) * 1000
-  } else {
-    time = +time
-  }
-  const d = new Date(time)
-  const now = Date.now()
+    if (('' + time).length === 10) {
+        time = parseInt(time) * 1000
+    } else {
+        time = +time
+    }
+    const d = new Date(time)
+    const now = Date.now()
 
-  const diff = (now - d) / 1000
+    const diff = (now - d) / 1000
 
-  if (diff < 30) {
-    return '刚刚'
-  } else if (diff < 3600) {
-    // less 1 hour
-    return Math.ceil(diff / 60) + '分钟前'
-  } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + '小时前'
-  } else if (diff < 3600 * 24 * 2) {
-    return '1天前'
-  }
-  if (option) {
-    return parseTime(time, option)
-  } else {
-    return (
-      d.getMonth() +
-      1 +
-      '月' +
-      d.getDate() +
-      '日' +
-      d.getHours() +
-      '时' +
-      d.getMinutes() +
-      '分'
-    )
-  }
+    if (diff < 30) {
+        return '刚刚'
+    } else if (diff < 3600) {
+        // less 1 hour
+        return Math.ceil(diff / 60) + '分钟前'
+    } else if (diff < 3600 * 24) {
+        return Math.ceil(diff / 3600) + '小时前'
+    } else if (diff < 3600 * 24 * 2) {
+        return '1天前'
+    }
+    if (option) {
+        return parseTime(time, option)
+    } else {
+        return (
+            d.getMonth() +
+            1 +
+            '月' +
+            d.getDate() +
+            '日' +
+            d.getHours() +
+            '时' +
+            d.getMinutes() +
+            '分'
+        )
+    }
 }
 
 /**
@@ -99,18 +101,18 @@ export function formatTime(time, option) {
  * @returns {Object}
  */
 export function getQueryObject(url) {
-  url = url == null ? window.location.href : url
-  const search = url.substring(url.lastIndexOf('?') + 1)
-  const obj = {}
-  const reg = /([^?&=]+)=([^?&=]*)/g
-  search.replace(reg, (rs, $1, $2) => {
-    const name = decodeURIComponent($1)
-    let val = decodeURIComponent($2)
-    val = String(val)
-    obj[name] = val
-    return rs
-  })
-  return obj
+    url = url == null ? window.location.href : url
+    const search = url.substring(url.lastIndexOf('?') + 1)
+    const obj = {}
+    const reg = /([^?&=]+)=([^?&=]*)/g
+    search.replace(reg, (rs, $1, $2) => {
+        const name = decodeURIComponent($1)
+        let val = decodeURIComponent($2)
+        val = String(val)
+        obj[name] = val
+        return rs
+    })
+    return obj
 }
 
 /**
@@ -118,15 +120,15 @@ export function getQueryObject(url) {
  * @returns {number} output value
  */
 export function byteLength(str) {
-  // returns the byte length of an utf8 string
-  let s = str.length
-  for (var i = str.length - 1; i >= 0; i--) {
-    const code = str.charCodeAt(i)
-    if (code > 0x7f && code <= 0x7ff) s++
-    else if (code > 0x7ff && code <= 0xffff) s += 2
-    if (code >= 0xDC00 && code <= 0xDFFF) i--
-  }
-  return s
+    // returns the byte length of an utf8 string
+    let s = str.length
+    for (var i = str.length - 1; i >= 0; i--) {
+        const code = str.charCodeAt(i)
+        if (code > 0x7f && code <= 0x7ff) s++
+        else if (code > 0x7ff && code <= 0xffff) s += 2
+        if (code >= 0xDC00 && code <= 0xDFFF) i--
+    }
+    return s
 }
 
 /**
@@ -134,13 +136,13 @@ export function byteLength(str) {
  * @returns {Array}
  */
 export function cleanArray(actual) {
-  const newArray = []
-  for (let i = 0; i < actual.length; i++) {
-    if (actual[i]) {
-      newArray.push(actual[i])
+    const newArray = []
+    for (let i = 0; i < actual.length; i++) {
+        if (actual[i]) {
+            newArray.push(actual[i])
+        }
     }
-  }
-  return newArray
+    return newArray
 }
 
 /**
@@ -148,13 +150,13 @@ export function cleanArray(actual) {
  * @returns {Array}
  */
 export function param(json) {
-  if (!json) return ''
-  return cleanArray(
-    Object.keys(json).map(key => {
-      if (json[key] === undefined) return ''
-      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
-    })
-  ).join('&')
+    if (!json) return ''
+    return cleanArray(
+        Object.keys(json).map(key => {
+            if (json[key] === undefined) return ''
+            return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+        })
+    ).join('&')
 }
 
 /**
@@ -162,21 +164,21 @@ export function param(json) {
  * @returns {Object}
  */
 export function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
-  if (!search) {
-    return {}
-  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
+    const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+    if (!search) {
+        return {}
     }
-  })
-  return obj
+    const obj = {}
+    const searchArr = search.split('&')
+    searchArr.forEach(v => {
+        const index = v.indexOf('=')
+        if (index !== -1) {
+            const name = v.substring(0, index)
+            const val = v.substring(index + 1, v.length)
+            obj[name] = val
+        }
+    })
+    return obj
 }
 
 /**
@@ -184,9 +186,9 @@ export function param2Obj(url) {
  * @returns {string}
  */
 export function html2Text(val) {
-  const div = document.createElement('div')
-  div.innerHTML = val
-  return div.textContent || div.innerText
+    const div = document.createElement('div')
+    div.innerHTML = val
+    return div.textContent || div.innerText
 }
 
 /**
@@ -196,21 +198,21 @@ export function html2Text(val) {
  * @returns {Object}
  */
 export function objectMerge(target, source) {
-  if (typeof target !== 'object') {
-    target = {}
-  }
-  if (Array.isArray(source)) {
-    return source.slice()
-  }
-  Object.keys(source).forEach(property => {
-    const sourceProperty = source[property]
-    if (typeof sourceProperty === 'object') {
-      target[property] = objectMerge(target[property], sourceProperty)
-    } else {
-      target[property] = sourceProperty
+    if (typeof target !== 'object') {
+        target = {}
+    }
+    if (Array.isArray(source)) {
+        return source.slice()
     }
-  })
-  return target
+    Object.keys(source).forEach(property => {
+        const sourceProperty = source[property]
+        if (typeof sourceProperty === 'object') {
+            target[property] = objectMerge(target[property], sourceProperty)
+        } else {
+            target[property] = sourceProperty
+        }
+    })
+    return target
 }
 
 /**
@@ -218,19 +220,19 @@ export function objectMerge(target, source) {
  * @param {string} className
  */
 export function toggleClass(element, className) {
-  if (!element || !className) {
-    return
-  }
-  let classString = element.className
-  const nameIndex = classString.indexOf(className)
-  if (nameIndex === -1) {
-    classString += '' + className
-  } else {
-    classString =
-      classString.substr(0, nameIndex) +
-      classString.substr(nameIndex + className.length)
-  }
-  element.className = classString
+    if (!element || !className) {
+        return
+    }
+    let classString = element.className
+    const nameIndex = classString.indexOf(className)
+    if (nameIndex === -1) {
+        classString += '' + className
+    } else {
+        classString =
+            classString.substr(0, nameIndex) +
+            classString.substr(nameIndex + className.length)
+    }
+    element.className = classString
 }
 
 /**
@@ -238,26 +240,26 @@ export function toggleClass(element, className) {
  * @returns {Date}
  */
 export function getTime(type) {
-  if (type === 'start') {
-    return new Date().getTime() - 3600 * 1000 * 24 * 90
-  } else {
-    return new Date(new Date().toDateString())
-  }
+    if (type === 'start') {
+        return new Date().getTime() - 3600 * 1000 * 24 * 90
+    } else {
+        return new Date(new Date().toDateString())
+    }
 }
 
 // 获取当前时间
 export function getFormatDate() {
-  var date = new Date();
-  var month = date.getMonth() + 1;
-  var strDate = date.getDate();
-  if (month >= 1 && month <= 9) {
-    month = "0" + month;
-  }
-  if (strDate >= 0 && strDate <= 9) {
-    strDate = "0" + strDate;
-  }
-  return date.getFullYear() + "-" + month + "-" + strDate
-      + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+    var date = new Date();
+    var month = date.getMonth() + 1;
+    var strDate = date.getDate();
+    if (month >= 1 && month <= 9) {
+        month = "0" + month;
+    }
+    if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+    }
+    return date.getFullYear() + "-" + month + "-" + strDate
+        + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
 }
 
 /**
@@ -267,38 +269,38 @@ export function getFormatDate() {
  * @return {*}
  */
 export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result
+    let timeout, args, context, timestamp, result
 
-  const later = function() {
-    // 据上一次触发时间间隔
-    const last = +new Date() - timestamp
+    const later = function () {
+        // 据上一次触发时间间隔
+        const last = +new Date() - timestamp
 
-    // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
-    if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last)
-    } else {
-      timeout = null
-      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
-      if (!immediate) {
-        result = func.apply(context, args)
-        if (!timeout) context = args = null
-      }
+        // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
+        if (last < wait && last > 0) {
+            timeout = setTimeout(later, wait - last)
+        } else {
+            timeout = null
+            // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+            if (!immediate) {
+                result = func.apply(context, args)
+                if (!timeout) context = args = null
+            }
+        }
     }
-  }
 
-  return function(...args) {
-    context = this
-    timestamp = +new Date()
-    const callNow = immediate && !timeout
-    // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait)
-    if (callNow) {
-      result = func.apply(context, args)
-      context = args = null
-    }
+    return function (...args) {
+        context = this
+        timestamp = +new Date()
+        const callNow = immediate && !timeout
+        // 如果延时不存在，重新设定延时
+        if (!timeout) timeout = setTimeout(later, wait)
+        if (callNow) {
+            result = func.apply(context, args)
+            context = args = null
+        }
 
-    return result
-  }
+        return result
+    }
 }
 
 /**
@@ -309,18 +311,18 @@ export function debounce(func, wait, immediate) {
  * @returns {Object}
  */
 export function deepClone(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
-  }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
-    } else {
-      targetObj[keys] = source[keys]
+    if (!source && typeof source !== 'object') {
+        throw new Error('error arguments', 'deepClone')
     }
-  })
-  return targetObj
+    const targetObj = source.constructor === Array ? [] : {}
+    Object.keys(source).forEach(keys => {
+        if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = deepClone(source[keys])
+        } else {
+            targetObj[keys] = source[keys]
+        }
+    })
+    return targetObj
 }
 
 /**
@@ -328,16 +330,16 @@ export function deepClone(source) {
  * @returns {Array}
  */
 export function uniqueArr(arr) {
-  return Array.from(new Set(arr))
+    return Array.from(new Set(arr))
 }
 
 /**
  * @returns {string}
  */
 export function createUniqueString() {
-  const timestamp = +new Date() + ''
-  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
-  return (+(randomNum + timestamp)).toString(32)
+    const timestamp = +new Date() + ''
+    const randomNum = parseInt((1 + Math.random()) * 65536) + ''
+    return (+(randomNum + timestamp)).toString(32)
 }
 
 /**
@@ -347,7 +349,7 @@ export function createUniqueString() {
  * @returns {boolean}
  */
 export function hasClass(ele, cls) {
-  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+    return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
 }
 
 /**
@@ -356,7 +358,7 @@ export function hasClass(ele, cls) {
  * @param {string} cls
  */
 export function addClass(ele, cls) {
-  if (!hasClass(ele, cls)) ele.className += ' ' + cls
+    if (!hasClass(ele, cls)) ele.className += ' ' + cls
 }
 
 /**
@@ -365,8 +367,8 @@ export function addClass(ele, cls) {
  * @param {string} cls
  */
 export function removeClass(ele, cls) {
-  if (hasClass(ele, cls)) {
-    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
-    ele.className = ele.className.replace(reg, ' ')
-  }
+    if (hasClass(ele, cls)) {
+        const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
+        ele.className = ele.className.replace(reg, ' ')
+    }
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 27707e6..fe8450e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -36,7 +36,7 @@
                 v-waves
                 :loading="downloadLoading"
                 class="filter-item"
-                type="primary"
+                type="success"
                 icon="el-icon-download"
                 @click="handleDownload"
             >
@@ -207,7 +207,8 @@
                     page: 1,
                     limit: 10,
                     search: '',
-                    is_check: ''
+                    is_check: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
@@ -242,56 +243,21 @@
                 this.menus = res.data;
             },
             // 获取角色列表
-            async getList() {
+            async getList(callback) {
                 this.listLoading = true;
-                const {data} = await getList(this.listQuery);
-                this.list = data.data;
-                this.total = data.total;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
-                    this.listLoading = false
-                }, 300)
-            },
-            // 下载
-            handleDownload() {
-                this.downloadLoading = true
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '角色名称',
-                        '创建时间',
-                        '启用状态'
-                    ];
-                    const filterVal = [
-                        'role_id',
-                        'role_name',
-                        'created_time',
-                        'is_check'
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: '角色列表-' + getFormatDate()
-                    });
-                    this.downloadLoading = false;
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        switch (j) {
-                            case 'created_time':
-                                return parseTime(v[j]);
-                                break;
-                            case 'is_check':
-                                return this.checkFilter(v[j]);
-                                break;
-                            default:
-                                return v[j];
-                                break;
-                        }
-                    })
-                )
+                    this.listLoading = false;
+                }, 300);
             },
             checkFilter(val) {
                 return calendarCheckKeyValue[val] || '';
@@ -366,14 +332,17 @@
             },
             handleSizeChange(val) {
                 this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleCurrentChange(val) {
                 this.listQuery.page = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleFilter() {
                 this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             generateTree(menus, menu_id = 0, checkedKeys) {
@@ -457,6 +426,64 @@
                     type: status == 1 ? 'success' : 'error',
                 });
             },
+            // 下载
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1) {
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '角色名称',
+                            '备注',
+                            '创建时间',
+                            '启用状态'
+                        ];
+                        const filterVal = [
+                            'role_id',
+                            'role_name',
+                            'role_remarks',
+                            'created_time',
+                            'is_check'
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data:download_list_data,
+                            filename: '角色列表-' + getFormatDate()
+                        });
+                        _this.downloadLoading = false;
+                    })
+                });
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v[j]);
+                                break;
+                            case 'is_check':
+                                return this.checkFilter(v[j]);
+                                break;
+                            default:
+                                return v[j];
+                                break;
+                        }
+                    })
+                )
+            },
         },
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
index 4c8dd38..d7f02ef 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
@@ -282,11 +282,11 @@
                 this.getList()
             },
             async getList() {
-                this.listLoading = true
-                const {data} = await getList(this.listQuery)
-                this.list = data.data
-                console.log(data)
-                this.total = data.total
+                this.listLoading = true;
+                const {data} = await getList(this.listQuery);
+                this.list = data.data;
+                this.total = data.total;
+                this.listQuery.limit = data.per_page || 10;
                 setTimeout(() => {
                     this.listLoading = false
                 }, 300)
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
index 3dd7968..e24d108 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
@@ -171,17 +171,16 @@
                 this.show = !this.show
             },
             cropSuccess(imgDataUrl, field) {
-                console.log('-------- crop success --------', imgDataUrl, field)
+                // console.log('-------- crop success --------', imgDataUrl, field)
             },
             // 上传成功回调
             cropUploadSuccess(result, field) {
-                console.log(result);
                 this.image_url = result.path_url;
                 this.form.admin_head = result.data;
             },
             // 上传失败回调
             cropUploadFail(status, field) {
-                console.log('-------- upload fail --------');
+                // console.log('-------- upload fail --------');
                 console.log('上传失败状态' + status);
                 console.log('field: ' + field)
             },
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 4a4ecb8..4fd3e0e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -36,7 +36,7 @@
                 v-waves
                 :loading="downloadLoading"
                 class="filter-item"
-                type="primary"
+                type="success"
                 icon="el-icon-download"
                 @click="handleDownload"
             >
@@ -135,8 +135,8 @@
 
 <script>
     import {getList, setDel, changeFiledStatus} from '@/api/admins';
-    import waves from '@/directive/waves' // waves directive
-    import Edit from './components/detail'
+    import waves from '@/directive/waves'; // waves directive
+    import Edit from './components/detail';
     import {parseTime, getFormatDate} from '@/utils/index';
 
     const calendarCheckOptions = [
@@ -151,7 +151,7 @@
     }, {});
 
     export default {
-        name: 'UserManagement',
+        name: 'adminManage',
         components: {Edit},
         directives: {waves},
         filters: {
@@ -181,66 +181,17 @@
                     page: 1,
                     limit: 10,
                     search: '',
-                    is_check: ''
+                    is_check: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
             }
         },
         created() {
-            this.getList()
+            this.getList();
         },
         methods: {
-            handleDownload() {
-                this.downloadLoading = true
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '管理员账户',
-                        '邮箱',
-                        '头像',
-                        '拥有角色',
-                        '创建时间',
-                        '启用状态'
-                    ];
-                    const filterVal = [
-                        'admin_id',
-                        'admin_name',
-                        'admin_email',
-                        'admin_head',
-                        'roles',
-                        'created_time',
-                        'is_check'
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: '管理员列表-' + getFormatDate()
-                    });
-                    this.downloadLoading = false;
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        switch (j) {
-                            case 'created_time':
-                                return parseTime(v[j]);
-                                break;
-                            case 'is_check':
-                                return this.checkFilter(v[j]);
-                                break;
-                            case 'admin_head':
-                                return v.cover.file_path;
-                                break;
-                            default:
-                                return v[j];
-                                break;
-                        }
-                    })
-                )
-            },
             checkFilter(val) {
                 return calendarCheckKeyValue[val] || '';
             },
@@ -255,6 +206,7 @@
                     this.$refs['edit'].showEdit({});
                 }
             },
+            // 删除
             handleDelete(row) {
                 var ids = '';
                 if (row.admin_id) {
@@ -304,22 +256,32 @@
                     })
             },
             handleSizeChange(val) {
-                this.listQuery.limit = val
-                this.getList()
+                this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
             handleCurrentChange(val) {
-                this.listQuery.page = val
-                this.getList()
+                this.listQuery.page = val;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
             handleFilter() {
-                this.listQuery.page = 1
-                this.getList()
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
-            async getList() {
+            async getList(callback) {
                 this.listLoading = true;
-                const {data} = await getList(this.listQuery);
-                this.list = data.data;
-                this.total = data.total;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
@@ -339,6 +301,66 @@
                     type: status == 1 ? 'success' : 'error',
                 });
             },
+            // 导出
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1){
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '管理员',
+                            '邮箱',
+                            '头像',
+                            '创建时间',
+                            '启用状态'
+                        ];
+                        const filterVal = [
+                            'admin_id',
+                            'admin_name',
+                            'admin_email',
+                            'admin_head',
+                            'created_time',
+                            'is_check'
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data:download_list_data,
+                            filename: '管理员列表-' + getFormatDate(),
+                        });
+                        _this.downloadLoading = false;
+                    })
+                });
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v['admin_info'][j]) || '';
+                                break;
+                            case 'is_check':
+                                return this.checkFilter(v[j]) || '';
+                                break;
+                            default:
+                                return v[j] || '';
+                                break;
+                        }
+                    })
+                ) || [];
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue
index b6431e1..e0155fc 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue
@@ -68,7 +68,6 @@
             },
             save() {
                 this.$refs['form'].validate(async (valid) => {
-                    console.log(valid);
                     if (valid) {
                         const {msg, status} = this.form.label_id ? await update(this.form) : await create(this.form);
                         this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue
index 6955db1..17251ec 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue
@@ -189,6 +189,7 @@
                 const {data} = await getList(this.listQuery);
                 this.list = data.data;
                 this.total = data.total;
+                this.listQuery.limit = data.per_page || 10;
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
index 039d3b7..ab13a4e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
@@ -309,7 +309,7 @@
                     // set page title
                     this.setPageTitle();
                 }).catch(err => {
-                    // console.log(err);
+                    console.log(err);
                 })
             },
             // 获取文章分类列表
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
index f243969..75e2545 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
@@ -56,7 +56,7 @@
                 v-waves
                 :loading="downloadLoading"
                 class="filter-item"
-                type="primary"
+                type="success"
                 icon="el-icon-download"
                 @click="handleDownload"
             >
@@ -79,7 +79,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" label="分类名称">
+            <el-table-column align="center" label="所属分类">
                 <template slot-scope="{row}">
                     {{ row.category? row.category.category_name : ('Id：' + row.category_id) }}
                 </template>
@@ -214,7 +214,7 @@
     }, {});
 
     export default {
-        name: 'ArticleList',
+        name: 'articleManage',
         components: {Pagination},
         directives: {waves},
         filters: {
@@ -240,7 +240,8 @@
                     is_check: -1,
                     category_id: -1,
                     page: 1,
-                    limit: 20,
+                    limit: 10,
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
@@ -265,13 +266,18 @@
                 this.getList();
             },
             // 文章列表
-            async getList() {
+            async getList(callback) {
                 this.listLoading = true;
-                const {data} = await getList(this.listQuery);
-                this.list = data.data;
-                this.total = data.total;
-                this.listQuery.page = parseInt(data.current_page) + 1;
-                this.listQuery.limit = data.per_page || 10;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
@@ -296,6 +302,7 @@
                 this.select_category_name = '请选择文章分类';
                 this.listQuery.category_id = -1;
             },
+            // 删除
             handleDelete(row) {
                 var ids = '';
                 if (row.article_id) {
@@ -357,38 +364,83 @@
             },
             // 下载
             handleDownload() {
-                this.downloadLoading = true
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '文章标题',
-                        '创建时间',
-                        '启用状态'
-                    ];
-                    const filterVal = [
-                        'article_id',
-                        'role_name',
-                        'created_time',
-                        'is_check'
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: '文章列表-' + getFormatDate()
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1){
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '文章标题',
+                            '所属分类',
+                            '封面',
+                            '关键字',
+                            '描述',
+                            '文章内容',
+                            '详情外链',
+                            '文章来源',
+                            '文章作者',
+                            '排序',
+                            '创建时间',
+                            '是否置顶',
+                            '是否推荐',
+                            '是否公开',
+                        ];
+                        const filterVal = [
+                            'article_id',
+                            'article_title',
+                            'category_id',
+                            'article_cover',
+                            'article_keywords',
+                            'article_description',
+                            'article_content',
+                            'article_link',
+                            'article_origin',
+                            'article_author',
+                            'article_sort',
+                            'created_time',
+                            'set_top',
+                            'is_recommend',
+                            'is_public',
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data:download_list_data,
+                            filename: '文章列表-' + getFormatDate(),
+                        });
+                        _this.downloadLoading = false;
                     });
-                    this.downloadLoading = false;
                 })
             },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
+            formatJson(data, filterVal) {
+                return data.map((v) =>
                     filterVal.map((j) => {
                         switch (j) {
+                            case 'category_id':
+                                return v.category ? v.category.category_name : '';
+                                break;
                             case 'created_time':
                                 return parseTime(v[j]);
                                 break;
-                            case 'is_check':
-                                return this.checkFilter(v[j]);
+                            case 'set_top':
+                                return v[j] == 1 ? '是' : '否';
+                                break;
+                            case 'is_recommend':
+                                return v[j] == 1 ? '是' : '否';
+                                break;
+                            case 'is_public':
+                                return v[j] == 1 ? '是' : '否';
                                 break;
                             default:
                                 return v[j];
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
index f9b7315..d8cf46a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
@@ -132,7 +132,7 @@
             },
             // 上传失败回调
             cropUploadFail(status, field) {
-                console.log('-------- upload fail --------');
+                // console.log('-------- upload fail --------');
                 console.log('上传失败状态' + status);
                 console.log('field: ' + field)
             },
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
index 8eb4a63..f157f4a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
@@ -2,19 +2,19 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入Banner标题"
-                    style="width: 200px;"
-                    class="filter-item"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入Banner标题"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="handleFilter"
             />
             <el-select v-model="listQuery.is_check" placeholder="请选择启用状态" clearable class="filter-item">
                 <el-option
-                        v-for="item in calendarCheckOptions"
-                        :key="item.key"
-                        :checked="item.key == listQuery.is_check"
-                        :label="item.display_name+'('+item.key+')'"
-                        :value="item.key"
+                    v-for="item in calendarCheckOptions"
+                    :key="item.key"
+                    :checked="item.key == listQuery.is_check"
+                    :label="item.display_name+'('+item.key+')'"
+                    :value="item.key"
                 />
             </el-select>
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
@@ -24,46 +24,46 @@
                 {{ $t('table.batchDelete') }}
             </el-button>
             <el-button
-                    class="filter-item"
-                    style="margin-left: 10px;"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleEdit"
+                class="filter-item"
+                style="margin-left: 10px;"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleEdit"
             >
                 {{ $t('table.add') }}
             </el-button>
             <el-button
-                    v-waves
-                    :loading="downloadLoading"
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-download"
-                    @click="handleDownload"
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="success"
+                icon="el-icon-download"
+                @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="banner_id"
-                    label="Id"
-                    align="center"
+                show-overflow-tooltip
+                prop="banner_id"
+                label="Id"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="banner_title"
-                    label="Banner标题"
-                    align="center"
+                show-overflow-tooltip
+                prop="banner_title"
+                label="Banner标题"
+                align="center"
             />
             <el-table-column align="center" prop="banner_cover" label="封面">
                 <template slot-scope="{row}">
@@ -71,15 +71,15 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="banner_link"
-                    label="外链"
+                show-overflow-tooltip
+                prop="banner_link"
+                label="外链"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="banner_sort"
-                    label="排序"
-                    align="center"
+                show-overflow-tooltip
+                prop="banner_sort"
+                label="排序"
+                align="center"
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
@@ -89,29 +89,29 @@
             <el-table-column align="center" prop="is_check" label="启用状态">
                 <template slot-scope="{row}">
                     <el-tag :type="row.is_check | statusFilter">
-                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'"/>
                         {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
             <el-table-column
-                    fixed="right"
-                    label="操作"
-                    align="center"
+                fixed="right"
+                label="操作"
+                align="center"
             >
                 <template v-slot="{row}">
                     <!-- 状态变更 -->
                     <el-button v-if="row.is_check == 0" type="text"
                                @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
-                            <i class="el-icon-unlock" />
+                            <i class="el-icon-unlock"/>
                             启用
                         </el-tag>
                     </el-button>
                     <el-button v-else-if="row.is_check == 1" type="text"
                                @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
-                            <i class="el-icon-lock" />
+                            <i class="el-icon-lock"/>
                             禁用
                         </el-tag>
                     </el-button>
@@ -123,13 +123,13 @@
         </el-table>
         <!-- 分页 -->
         <el-pagination
-                background
-                :current-page="listQuery.page"
-                :page-size="listQuery.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
         <!-- 详情 -->
         <edit ref="edit" @fetchData="getList"/>
@@ -138,23 +138,23 @@
 
 <script>
     import {getList, setDel, changeFiledStatus} from '@/api/banners';
-    import waves from '@/directive/waves' // waves directive
-    import Edit from './components/detail'
+    import waves from '@/directive/waves'; // waves directive
+    import Edit from './components/detail';
     import {parseTime, getFormatDate} from '@/utils/index';
 
     const calendarCheckOptions = [
         {key: '-1', display_name: '全部'},
         {key: '1', display_name: '启用'},
         {key: '0', display_name: '禁用'}
-    ]
+    ];
 
     const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
         acc[cur.key] = cur.display_name
         return acc
-    }, {})
+    }, {});
 
     export default {
-        name: 'UserManagement',
+        name: 'bannerManage',
         components: {Edit},
         directives: {waves},
         filters: {
@@ -184,64 +184,17 @@
                     page: 1,
                     limit: 10,
                     search: '',
-                    is_check: ''
+                    is_check: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
                 calendarCheckOptions
             }
         },
         created() {
-            this.getList()
+            this.getList();
         },
         methods: {
-            handleDownload() {
-                this.downloadLoading = true
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        'Banner标题',
-                        '封面',
-                        '外链（URL）',
-                        '创建时间',
-                        '启用状态'
-                    ];
-                    const filterVal = [
-                        'banner_id',
-                        'banner_title',
-                        'banner_cover',
-                        'banner_link',
-                        'created_time',
-                        'is_check'
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: 'Banner列表-' + getFormatDate()
-                    });
-                    this.downloadLoading = false;
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        switch (j) {
-                            case 'created_time':
-                                return parseTime(v[j]);
-                                break;
-                            case 'is_check':
-                                return this.checkFilter(v[j]);
-                                break;
-                            case 'banner_cover':
-                                return v.cover.file_path;
-                                break;
-                            default:
-                                return v[j];
-                                break;
-                        }
-                    })
-                )
-            },
             checkFilter(val) {
                 return calendarCheckKeyValue[val] || '';
             },
@@ -279,7 +232,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({banner_id: ids, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({banner_id: ids, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
@@ -306,24 +259,34 @@
             },
             handleSizeChange(val) {
                 this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleCurrentChange(val) {
-                this.listQuery.page = val
-                this.getList()
+                this.listQuery.page = val;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
             handleFilter() {
-                this.listQuery.page = 1
-                this.getList()
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
-            async getList() {
-                this.listLoading = true
-                const {data} = await getList(this.listQuery)
-                this.list = data.data
-                this.total = data.total
+            async getList(callback) {
+                this.listLoading = true;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
-                    this.listLoading = false
-                }, 300)
+                    this.listLoading = false;
+                }, 300);
             },
             // 状态变更
             async changeStatus(row, value) {
@@ -340,6 +303,67 @@
                     type: status == 1 ? 'success' : 'error',
                 });
             },
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1) {
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            'Banner标题',
+                            '封面',
+                            '外链（URL）',
+                            '排序',
+                            '创建时间',
+                            '启用状态'
+                        ];
+                        const filterVal = [
+                            'banner_id',
+                            'banner_title',
+                            'banner_cover',
+                            'banner_link',
+                            'banner_sort',
+                            'created_time',
+                            'is_check'
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data: download_list_data,
+                            filename: 'Banner列表-' + getFormatDate(),
+                        });
+                        _this.downloadLoading = false;
+                    });
+                })
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v[j]);
+                                break;
+                            case 'is_check':
+                                return this.checkFilter(v[j]);
+                                break;
+                            default:
+                                return v[j];
+                                break;
+                        }
+                    })
+                )
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index f52072c..8d4c412 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -153,8 +153,8 @@
         </el-table>
         <el-pagination
             background
-            :current-page="queryForm.page"
-            :page-size="queryForm.limit"
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
             :layout="layout"
             :total="total"
             @size-change="handleSizeChange"
@@ -164,23 +164,23 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiledStatus, pushRefreshConfig} from '@/api/configs'
-    import waves from '@/directive/waves' // waves directive
-    import {parseTime} from '@/utils/index';
+    import {getList, setDel, changeFiledStatus, pushRefreshConfig} from '@/api/configs';
+    import waves from '@/directive/waves'; // waves directive
+    import {parseTime, getFormatDate} from '@/utils/index';
 
     const calendarCheckOptions = [
         {key: '-1', display_name: '全部'},
         {key: '1', display_name: '启用'},
         {key: '0', display_name: '禁用'}
-    ]
+    ];
 
     const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
         acc[cur.key] = cur.display_name
         return acc
-    }, {})
+    }, {});
 
     export default {
-        name: 'UserManagement',
+        name: 'configManage',
         components: {},
         directives: {waves},
         filters: {
@@ -189,12 +189,12 @@
                 const statusMap = {
                     1: 'success',
                     0: 'danger'
-                }
-                return statusMap[status]
+                };
+                return statusMap[status];
             },
             checkFilter(type) {
-                return calendarCheckKeyValue[type] || ''
-            }
+                return calendarCheckKeyValue[type] || '';
+            },
         },
         data() {
             return {
@@ -202,11 +202,12 @@
                 layout: 'total, sizes, prev, pager, next, jumper',
                 selectRows: '',
                 elementLoadingText: '正在加载...',
-                queryForm: {
+                listQuery: {
                     page: 1,
                     limit: 10,
                     search: '',
-                    is_check: ''
+                    is_check: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
@@ -214,11 +215,6 @@
                 list: [],
                 total: 0,
                 listLoading: true,
-                listQuery: {
-                    page: 1,
-                    limit: 20,
-                    is_check: ''
-                },
                 importanceOptions: [1, 2, 3],
                 statusOptions: ['published', 'draft', 'deleted'],
                 temp: {
@@ -240,54 +236,11 @@
             }
         },
         created() {
-            this.getList()
+            this.getList();
         },
         methods: {
-            handleDownload() {
-                this.downloadLoading = true
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '管理员',
-                        '邮箱',
-                        '登录次数',
-                        '创建时间',
-                        '启用状态'
-                    ]
-                    const filterVal = [
-                        'config_id',
-                        'admin_name',
-                        'admin_email',
-                        'admin_info.login_num',
-                        'admin_info.created_time',
-                        'is_check'
-                    ]
-                    const data = this.formatJson(filterVal)
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: 'table-list'
-                    })
-                    this.downloadLoading = false
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        if (j === 'admin_info.created_time') {
-                            return parseTime(v.admin_info.created_time)
-                        } else if (j === 'is_check') {
-                            return this.checkFilter(v[j])
-                        } else if (j === 'admin_info.login_num') {
-                            return v.admin_info.login_num
-                        } else {
-                            return v[j]
-                        }
-                    })
-                )
-            },
             checkFilter(val) {
-                return calendarCheckKeyValue[val] || ''
+                return calendarCheckKeyValue[val] || '';
             },
             setSelectRows(val) {
                 this.selectRows = val;
@@ -302,6 +255,7 @@
                     'query': query,
                 });
             },
+            // 删除
             handleDelete(row) {
                 var ids = '';
                 if (row.config_id) {
@@ -311,7 +265,7 @@
                         ids = this.selectRows.map((item) => item.config_id).join();
                     } else {
                         this.$message('未选中任何行', 'error');
-                        return false
+                        return false;
                     }
                 }
 
@@ -329,7 +283,6 @@
 
                         switch (status) {
                             case 1:
-                                // this.list.splice($index, 1);
                                 this.getList();
 
                                 this.$message({
@@ -347,29 +300,39 @@
 
                     })
                     .catch(err => {
-                        console.error(err)
+                        console.error(err);
                     })
             },
             handleSizeChange(val) {
-                this.queryForm.limit = val
-                this.getList()
+                this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
             handleCurrentChange(val) {
-                this.queryForm.page = val
-                this.getList()
+                this.listQuery.page = val;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
             handleFilter() {
-                this.queryForm.page = 1
-                this.getList()
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
+                this.getList();
             },
-            async getList() {
-                this.listLoading = true
-                const {data} = await getList(this.queryForm)
-                this.list = data.data
-                this.total = data.total
+            async getList(callback) {
+                this.listLoading = true;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
-                    this.listLoading = false
-                }, 300)
+                    this.listLoading = false;
+                }, 300);
             },
             // 状态变更
             async changeStatus(row, value) {
@@ -400,6 +363,76 @@
                     this.listLoading = false;
                 }, 300);
             },
+            // 导出
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1){
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '配置标题',
+                            '配置名称',
+                            '配置值',
+                            '配置分组',
+                            '配置类型',
+                            '配置项',
+                            '排序',
+                            '说明',
+                            '创建时间',
+                            '启用状态'
+                        ]
+                        const filterVal = [
+                            'config_id',
+                            'config_title',
+                            'config_name',
+                            'config_value',
+                            'config_group',
+                            'config_type',
+                            'config_extra',
+                            'config_sort',
+                            'config_remark',
+                            'created_time',
+                            'is_check'
+                        ]
+                        const download_list_data = _this.formatJson(data, filterVal)
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data:download_list_data,
+                            filename: '配置列表-' + getFormatDate(),
+                        })
+                        _this.downloadLoading = false;
+                    });
+                })
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v[j]) || '';
+                                break;
+                            case 'is_check':
+                                return this.checkFilter(v[j]) || '';
+                                break;
+                            default:
+                                return v[j] || '';
+                                break;
+                        }
+                    })
+                ) || [];
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
index 1b17866..2cb65d2 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
@@ -132,11 +132,10 @@
             },
             // 上传失败回调
             cropUploadFail(status, field) {
-                console.log('-------- upload fail --------');
+                // console.log('-------- upload fail --------');
                 console.log('上传失败状态' + status);
                 console.log('field: ' + field)
             },
-
             showEdit(row) {
                 const detail = Object.assign({}, row);
                 if (!detail) {
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
index 4f8d736..8c06ba3 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
@@ -2,19 +2,19 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入站点名称"
-                    style="width: 200px;"
-                    class="filter-item"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入站点名称"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="handleFilter"
             />
             <el-select v-model="listQuery.is_check" placeholder="请选择启用状态" clearable class="filter-item">
                 <el-option
-                        v-for="item in calendarCheckOptions"
-                        :key="item.key"
-                        :checked="item.key == listQuery.is_check"
-                        :label="item.display_name+'('+item.key+')'"
-                        :value="item.key"
+                    v-for="item in calendarCheckOptions"
+                    :key="item.key"
+                    :checked="item.key == listQuery.is_check"
+                    :label="item.display_name+'('+item.key+')'"
+                    :value="item.key"
                 />
             </el-select>
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
@@ -24,46 +24,46 @@
                 {{ $t('table.batchDelete') }}
             </el-button>
             <el-button
-                    class="filter-item"
-                    style="margin-left: 10px;"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleEdit"
+                class="filter-item"
+                style="margin-left: 10px;"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleEdit"
             >
                 {{ $t('table.add') }}
             </el-button>
             <el-button
-                    v-waves
-                    :loading="downloadLoading"
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-download"
-                    @click="handleDownload"
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="success"
+                icon="el-icon-download"
+                @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="link_id"
-                    label="Id"
-                    align="center"
+                show-overflow-tooltip
+                prop="link_id"
+                label="Id"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="link_name"
-                    label="站点名称"
-                    align="center"
+                show-overflow-tooltip
+                prop="link_name"
+                label="站点名称"
+                align="center"
             />
             <el-table-column align="center" prop="link_cover" label="站点图标">
                 <template slot-scope="{row}">
@@ -71,15 +71,15 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="link_url"
-                    label="站点网址"
+                show-overflow-tooltip
+                prop="link_url"
+                label="站点网址"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="link_sort"
-                    label="排序"
-                    align="center"
+                show-overflow-tooltip
+                prop="link_sort"
+                label="排序"
+                align="center"
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
@@ -89,29 +89,29 @@
             <el-table-column align="center" prop="is_check" label="启用状态">
                 <template slot-scope="{row}">
                     <el-tag :type="row.is_check | statusFilter">
-                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'" />
+                        <i :class="row.is_check == 1 ? 'el-icon-unlock' : 'el-icon-lock'"/>
                         {{ row.is_check | checkFilter }}
                     </el-tag>
                 </template>
             </el-table-column>
             <el-table-column
-                    fixed="right"
-                    label="操作"
-                    align="center"
+                fixed="right"
+                label="操作"
+                align="center"
             >
                 <template v-slot="{row}">
                     <!-- 状态变更 -->
                     <el-button v-if="row.is_check == 0" type="text"
                                @click="changeStatus(row, 1)">
                         <el-tag :type="1 | statusFilter">
-                            <i class="el-icon-unlock" />
+                            <i class="el-icon-unlock"/>
                             启用
                         </el-tag>
                     </el-button>
                     <el-button v-else-if="row.is_check == 1" type="text"
                                @click="changeStatus(row, 0)">
                         <el-tag :type="0 | statusFilter">
-                            <i class="el-icon-lock" />
+                            <i class="el-icon-lock"/>
                             禁用
                         </el-tag>
                     </el-button>
@@ -122,13 +122,13 @@
             </el-table-column>
         </el-table>
         <el-pagination
-                background
-                :current-page="listQuery.page"
-                :page-size="listQuery.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
         <edit ref="edit" @fetchData="getList"/>
     </div>
@@ -144,15 +144,15 @@
         {key: '-1', display_name: '全部'},
         {key: '1', display_name: '启用'},
         {key: '0', display_name: '禁用'}
-    ]
+    ];
 
     const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
         acc[cur.key] = cur.display_name
         return acc
-    }, {})
+    }, {});
 
     export default {
-        name: '',
+        name: 'friendlinkManage',
         components: {Edit},
         directives: {waves},
         filters: {
@@ -163,10 +163,10 @@
                     1: 'success',
                     0: 'danger'
                 }
-                return statusMap[status]
+                return statusMap[status];
             },
             checkFilter(type) {
-                return calendarCheckKeyValue[type] || ''
+                return calendarCheckKeyValue[type] || '';
             }
         },
         data() {
@@ -186,61 +186,14 @@
                     limit: 20,
                     is_check: '',
                     search: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
             }
         },
         created() {
-            this.getList()
+            this.getList();
         },
         methods: {
-            handleDownload() {
-                this.downloadLoading = true;
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '站点名称',
-                        '站点图标（URL）',
-                        '站点网址',
-                        '创建时间',
-                        '启用状态'
-                    ];
-                    const filterVal = [
-                        'link_id',
-                        'link_name',
-                        'link_cover',
-                        'link_url',
-                        'created_time',
-                        'is_check'
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: '友情链接列表-' + getFormatDate()
-                    });
-                    this.downloadLoading = false
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        switch (j) {
-                            case 'created_time':
-                                return parseTime(v[j]);
-                                break;
-                            case 'is_check':
-                                return this.checkFilter(v[j]);
-                                break;
-                            case 'link_cover':
-                                return v.cover.file_path;
-                                break;
-                            default:
-                                return v[j];
-                                break;
-                        }
-                    })
-                )
-            },
             checkFilter(val) {
                 return calendarCheckKeyValue[val] || '';
             },
@@ -255,6 +208,7 @@
                     this.$refs['edit'].showEdit()
                 }
             },
+            // 删除
             handleDelete(row) {
                 var ids = '';
                 if (row.link_id) {
@@ -278,7 +232,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({link_id: ids, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({link_id: ids, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
@@ -305,21 +259,31 @@
             },
             handleSizeChange(val) {
                 this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleCurrentChange(val) {
                 this.listQuery.page = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleFilter() {
                 this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
-            async getList() {
+            async getList(callback) {
                 this.listLoading = true;
-                const {data} = await getList(this.listQuery);
-                this.list = data.data;
-                this.total = data.total;
+                const {data, status, msg} = await getList(this.listQuery);
+                if(this.listQuery.is_download == 1){
+                    if (callback){
+                        callback(data, status, msg);
+                    }
+                }else{
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
@@ -339,6 +303,65 @@
                     type: status == 1 ? 'success' : 'error',
                 });
             },
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1) {
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '站点名称',
+                            '站点图标（URL）',
+                            '站点网址',
+                            '创建时间',
+                            '启用状态'
+                        ];
+                        const filterVal = [
+                            'link_id',
+                            'link_name',
+                            'link_cover',
+                            'link_url',
+                            'created_time',
+                            'is_check'
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data: download_list_data,
+                            filename: '友情链接列表-' + getFormatDate(),
+                        });
+                        _this.downloadLoading = false;
+                    });
+                })
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v[j]);
+                                break;
+                            case 'is_check':
+                                return this.checkFilter(v[j]);
+                                break;
+                            default:
+                                return v[j];
+                                break;
+                        }
+                    })
+                )
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
index c0a8e57..ff5ac51 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
@@ -2,11 +2,11 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入 版本名称|版本号"
-                    style="width: 200px;"
-                    class="filter-item"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入 版本名称|版本号"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="handleFilter"
             />
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
                 {{ $t('table.search') }}
@@ -15,47 +15,47 @@
                 {{ $t('table.batchDelete') }}
             </el-button>
             <el-button
-                    class="filter-item"
-                    style="margin-left: 10px;"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleEdit"
+                class="filter-item"
+                style="margin-left: 10px;"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleEdit"
             >
                 {{ $t('table.add') }}
             </el-button>
             <el-button
-                    v-waves
-                    :loading="downloadLoading"
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-download"
-                    @click="handleDownload"
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="success"
+                icon="el-icon-download"
+                @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="version_id"
-                    label="Id"
-                    align="center"
+                show-overflow-tooltip
+                prop="version_id"
+                label="Id"
+                align="center"
             />
 
             <el-table-column
-                    show-overflow-tooltip
-                    prop="version_name"
-                    label="版本名称"
-                    align="center"
+                show-overflow-tooltip
+                prop="version_name"
+                label="版本名称"
+                align="center"
             />
 
             <el-table-column
@@ -66,10 +66,10 @@
             />
 
             <el-table-column
-                    show-overflow-tooltip
-                    prop="version_sort"
-                    label="排序"
-                    align="center"
+                show-overflow-tooltip
+                prop="version_sort"
+                label="排序"
+                align="center"
             />
 
             <el-table-column
@@ -86,9 +86,9 @@
             </el-table-column>
 
             <el-table-column
-                    fixed="right"
-                    label="操作"
-                    align="center"
+                fixed="right"
+                label="操作"
+                align="center"
             >
                 <template v-slot="{row}">
                     <!-- 编辑与删除 -->
@@ -99,13 +99,13 @@
         </el-table>
         <!-- 分页 -->
         <el-pagination
-                background
-                :current-page="listQuery.page"
-                :page-size="listQuery.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
         <!-- 详情 -->
         <edit ref="edit" @fetchData="getList"/>
@@ -114,12 +114,12 @@
 
 <script>
     import {getList, setDel} from '@/api/versions';
-    import waves from '@/directive/waves' // waves directive
-    import Edit from './components/detail'
+    import waves from '@/directive/waves'; // waves directive
+    import Edit from './components/detail';
     import {parseTime, getFormatDate} from '@/utils/index';
 
     export default {
-        name: 'Versions',
+        name: 'versionsManage',
         components: {Edit},
         directives: {waves},
         filters: {
@@ -139,7 +139,8 @@
                     page: 1,
                     limit: 10,
                     search: '',
-                    is_check: ''
+                    is_check: '',
+                    is_download: 0, // 是否下载：1.是；默认0
                 },
                 downloadLoading: false,
             }
@@ -148,41 +149,6 @@
             this.getList();
         },
         methods: {
-            handleDownload() {
-                this.downloadLoading = true;
-                import('@/vendor/Export2Excel').then((excel) => {
-                    const tHeader = [
-                        'Id',
-                        '版本名称',
-                        '版本号',
-                        '发布时间',
-                    ];
-                    const filterVal = [
-                        'version_id',
-                        'version_name',
-                        'version_number',
-                        'publish_date',
-                    ];
-                    const data = this.formatJson(filterVal);
-                    excel.export_json_to_excel({
-                        header: tHeader,
-                        data,
-                        filename: '版本列表-' + getFormatDate()
-                    });
-                    this.downloadLoading = false;
-                })
-            },
-            formatJson(filterVal) {
-                return this.list.map((v) =>
-                    filterVal.map((j) => {
-                        switch (j) {
-                            default:
-                                return v[j];
-                                break;
-                        }
-                    })
-                )
-            },
             setSelectRows(val) {
                 this.selectRows = val;
                 this.is_batch = 1;
@@ -217,7 +183,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({version_id: ids, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({version_id: ids, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
@@ -243,25 +209,94 @@
             },
             handleSizeChange(val) {
                 this.listQuery.limit = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleCurrentChange(val) {
                 this.listQuery.page = val;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
             handleFilter() {
                 this.listQuery.page = 1;
+                this.listQuery.is_download = 0;
                 this.getList();
             },
-            async getList() {
+            async getList(callback) {
                 this.listLoading = true;
-                const {data} = await getList(this.listQuery);
-                this.list = data.data;
-                this.total = data.total;
+                const {data, status, msg} = await getList(this.listQuery);
+                if (this.listQuery.is_download == 1) {
+                    if (callback) {
+                        callback(data, status, msg);
+                    }
+                } else {
+                    this.list = data.data;
+                    this.total = data.total;
+                    this.listQuery.limit = data.per_page || 10;
+                }
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
             },
+            // 导出
+            handleDownload() {
+                this.downloadLoading = true;
+                this.listQuery.page = 1;
+                this.listQuery.is_download = 1;
+                let _this = this;
+                this.getList(function (data, status, msg) {
+                    // 如果获取失败，那么无需进入下一步
+                    if (status != 1) {
+                        _this.$message({
+                            message: msg,
+                            type: 'error',
+                        });
+                        return;
+                    }
+                    // 开始导出
+                    import('@/vendor/Export2Excel').then((excel) => {
+                        const tHeader = [
+                            'Id',
+                            '版本名称',
+                            '版本号',
+                            '版本内容',
+                            '排序',
+                            '版本发布时间',
+                            '创建时间',
+                        ];
+                        const filterVal = [
+                            'version_id',
+                            'version_name',
+                            'version_number',
+                            'version_content',
+                            'version_sort',
+                            'publish_date',
+                            'created_time',
+                        ];
+                        const download_list_data = _this.formatJson(data, filterVal);
+                        excel.export_json_to_excel({
+                            header: tHeader,
+                            data: download_list_data,
+                            filename: '版本列表-' + getFormatDate(),
+                        });
+                        _this.downloadLoading = false;
+                    })
+                })
+            },
+            formatJson(data, filterVal) {
+                return data.map((v) =>
+                    filterVal.map((j) => {
+                        switch (j) {
+                            case 'created_time':
+                                return parseTime(v[j]) || '';
+                                break;
+                            default:
+                                return v[j];
+                                break;
+                        }
+                    })
+                ) || [];
+            },
         }
     }
 </script>
-- 
Gitee