From dc2778fd94b9ca74b38107165f450affc15bbb4a Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Thu, 19 May 2022 11:40:51 +0800
Subject: [PATCH] 1

---
 .../Actions/Grid/ProductDownloadTemplate.php  | 19 +++++++++++++++++++
 .../Controllers/ProductSpuController.php      |  3 ++-
 app/Admin/Controllers/UserController.php      |  1 +
 app/Endpoint/Api/routes.php                   |  2 +-
 resources/lang/zh_CN/user.php                 |  1 +
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/Admin/Actions/Grid/ProductDownloadTemplate.php

diff --git a/app/Admin/Actions/Grid/ProductDownloadTemplate.php b/app/Admin/Actions/Grid/ProductDownloadTemplate.php
new file mode 100644
index 00000000..1713cd27
--- /dev/null
+++ b/app/Admin/Actions/Grid/ProductDownloadTemplate.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Admin\Actions\Grid;
+
+use Dcat\Admin\Admin;
+use Dcat\Admin\Grid\Tools\AbstractTool;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\Request;
+
+class ProductDownloadTemplate extends AbstractTool
+{
+    protected $style = 'btn btn-white waves-effect';
+    protected $title = '下载商品模板';
+
+    public function handle(Request $request)
+    {
+        return Storage::disk('local')->download('excel-template/goods.xlsx', '导入商品模板.xlsx');
+    }
+}
diff --git a/app/Admin/Controllers/ProductSpuController.php b/app/Admin/Controllers/ProductSpuController.php
index 2e15e579..071ee12f 100644
--- a/app/Admin/Controllers/ProductSpuController.php
+++ b/app/Admin/Controllers/ProductSpuController.php
@@ -76,7 +76,8 @@ class ProductSpuController extends AdminController
 
             $grid->tools(function  (Grid\Tools  $tools)  { 
                 // Excel导入
-                $tools->append(new  \App\Admin\Actions\Modal\ProductImport());  
+                $tools->append(new  \App\Admin\Actions\Modal\ProductImport());
+                $tools->append(new  \App\Admin\Actions\Grid\ProductDownloadTemplate());
             });
 
             /** 查询 **/
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index 252962bf..f2aa0e6b 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -168,6 +168,7 @@ class UserController extends AdminController
                         $show->field('user_info.is_company')->as(function ($v) {
                             return $v ? '是' : '否';
                         });
+                        $show->field('vip_expired');
 
                         // $show->field('wallet.balance')->as(function ($value) {
                         //     $value = bcdiv($value, 100, 2);
diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php
index 2503706e..527de94a 100644
--- a/app/Endpoint/Api/routes.php
+++ b/app/Endpoint/Api/routes.php
@@ -227,11 +227,11 @@ Route::group([
     // 文章
     Route::get('articles/category', [ArticleController::class, 'category']);
     Route::get('articles/category-tree', [ArticleController::class, 'categoryTree']);
+    Route::get('articles/{article}', [ArticleController::class, 'show']);
     /** 以前的路由 */
     Route::get('article-config', [ArticleController::class, 'config']);
     Route::get('articles', [ArticleController::class, 'index']);
     Route::group(['middleware' => ['auth:api', \App\Endpoint\Api\Http\Middleware\CheckUserStatus::class]], function () {
-        Route::get('articles/{article}', [ArticleController::class, 'show']);
         Route::post('articles/{article}/read', [ArticleController::class, 'read']);
         Route::post('articles/{article}/like', [ArticleController::class, 'like']);
     });
diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php
index 47acc1b6..be33c8ff 100644
--- a/resources/lang/zh_CN/user.php
+++ b/resources/lang/zh_CN/user.php
@@ -39,6 +39,7 @@ return [
         ],
         'status_remark'=>'备注',
         'profit' => '累计返利',
+        'vip_expired' => '会员',
     ],
     'options' => [
     ],