浏览代码

feat: money page link button in user index

M1Screw 2 年之前
父节点
当前提交
20a551e12a

+ 1 - 0
phpinsights.php

@@ -29,6 +29,7 @@ return [
         SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff::class,
+        SlevomatCodingStandard\Sniffs\Variables\UnusedVariableSniff::class,
     ],
     ],
     'config' => [
     'config' => [
         PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff::class => [
         PHP_CodeSniffer\Standards\PSR1\Sniffs\Methods\CamelCapsMethodNameSniff::class => [

+ 2 - 6
resources/views/tabler/admin/coupon.tpl

@@ -18,17 +18,13 @@
                         </span>
                         </span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#create-dialog">
                             data-bs-target="#create-dialog">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             创建
                             创建
                         </a>
                         </a>
-                        <a href="#" class="btn btn-primary d-sm-none btn-icon" data-bs-toggle="modal"
-                            data-bs-target="#create-dialog">
-                            <i class="icon ti ti-plus"></i>
-                        </a>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

+ 2 - 2
resources/views/tabler/admin/detect.tpl

@@ -12,9 +12,9 @@
                         <span class="home-subtitle">查看站点中的审计规则</span>
                         <span class="home-subtitle">查看站点中的审计规则</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#add-detect-dialog">
                             data-bs-target="#add-detect-dialog">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             添加审计规则
                             添加审计规则

+ 2 - 2
resources/views/tabler/admin/giftcard.tpl

@@ -14,9 +14,9 @@
                         </span>
                         </span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#create-dialog">
                             data-bs-target="#create-dialog">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             创建
                             创建

+ 2 - 6
resources/views/tabler/admin/invoice/view.tpl

@@ -13,17 +13,13 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 {if $invoice->status === 'unpaid'}
                 {if $invoice->status === 'unpaid'}
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#mark_paid_confirm_dialog">
                             data-bs-target="#mark_paid_confirm_dialog">
                             <i class="icon ti ti-checklist"></i>
                             <i class="icon ti ti-checklist"></i>
                             标记为支付
                             标记为支付
                         </button>
                         </button>
-                        <button href="#" class="btn btn-primary d-sm-none btn-icon" data-bs-toggle="modal"
-                            data-bs-target="#mark_paid_confirm_dialog">
-                            <i class="icon ti ti-checklist"></i>
-                        </button>
                     </div>
                     </div>
                 </div>
                 </div>
                 {/if}
                 {/if}

+ 3 - 3
resources/views/tabler/admin/log/invite.tpl

@@ -12,14 +12,14 @@
                         <span class="home-subtitle">查看用户的返利记录</span>
                         <span class="home-subtitle">查看用户的返利记录</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#update-invite-dialog">
                             data-bs-target="#update-invite-dialog">
                             <i class="icon ti ti-user-edit"></i>
                             <i class="icon ti ti-user-edit"></i>
                             修改邀请者
                             修改邀请者
                         </button>
                         </button>
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#add-invite-dialog">
                             data-bs-target="#add-invite-dialog">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             添加邀请数量
                             添加邀请数量

+ 4 - 4
resources/views/tabler/admin/order/view.tpl

@@ -12,18 +12,18 @@
                         <span class="home-subtitle">订单详情</span>
                         <span class="home-subtitle">订单详情</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="/admin/user/{$order->user_id}/edit" targer="_blank" class="btn btn-primary d-none d-sm-inline-block">
+                        <a href="/admin/user/{$order->user_id}/edit" targer="_blank" class="btn btn-primary">
                             <i class="icon ti ti-user"></i>
                             <i class="icon ti ti-user"></i>
                             查看关联用户
                             查看关联用户
                         </a>
                         </a>
-                        <a href="/admin/invoice/{$invoice->id}/view" targer="_blank" class="btn btn-primary d-none d-sm-inline-block">
+                        <a href="/admin/invoice/{$invoice->id}/view" targer="_blank" class="btn btn-primary">
                             <i class="icon ti ti-file-dollar"></i>
                             <i class="icon ti ti-file-dollar"></i>
                             查看关联账单
                             查看关联账单
                         </a>
                         </a>
                         {if $order->status === 'pending_payment'}
                         {if $order->status === 'pending_payment'}
-                        <button href="#" class="btn btn-red d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-red" data-bs-toggle="modal"
                             data-bs-target="#cancel_order_confirm_dialog">
                             data-bs-target="#cancel_order_confirm_dialog">
                             <i class="icon ti ti-x"></i>
                             <i class="icon ti ti-x"></i>
                             取消订单
                             取消订单

+ 1 - 1
resources/views/tabler/admin/tabler_header.tpl

@@ -10,7 +10,7 @@
     <title>{$config['appName']}</title>
     <title>{$config['appName']}</title>
     <!-- CSS files -->
     <!-- CSS files -->
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
-    <link href="//cdn.jsdelivr.net/npm/@tabler/icons@latest/iconfont/tabler-icons.min.css" rel="stylesheet" />
+    <link href="//cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css" rel="stylesheet" />
     <link href="//cdn.datatables.net/v/bs5/dt-1.13.4/datatables.min.css" rel="stylesheet" />
     <link href="//cdn.datatables.net/v/bs5/dt-1.13.4/datatables.min.css" rel="stylesheet" />
     <!-- JS files -->
     <!-- JS files -->
     <script src="//cdn.jsdelivr.net/npm/qrcode_js@latest/qrcode.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/qrcode_js@latest/qrcode.min.js"></script>

+ 4 - 4
resources/views/tabler/admin/ticket/view.tpl

@@ -12,20 +12,20 @@
                         <span class="home-subtitle">你可以在这里查看历史消息并添加回复</span>
                         <span class="home-subtitle">你可以在这里查看历史消息并添加回复</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
                         {if $ticket->status !== 'closed'}
                         {if $ticket->status !== 'closed'}
-                        <button href="#" class="btn btn-red d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-red" data-bs-toggle="modal"
                             data-bs-target="#close_ticket_confirm_dialog">
                             data-bs-target="#close_ticket_confirm_dialog">
                             <i class="icon ti ti-x"></i>
                             <i class="icon ti ti-x"></i>
                             关闭
                             关闭
                         </button>
                         </button>
                         {/if}
                         {/if}
-                        <button id="add_ai_reply" href="#" class="btn btn-primary d-none d-sm-inline-block">
+                        <button id="add_ai_reply" href="#" class="btn btn-primary">
                             <i class="icon ti ti-robot"></i>
                             <i class="icon ti ti-robot"></i>
                             AI 回复
                             AI 回复
                         </button>
                         </button>
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#add-reply">
                             data-bs-target="#add-reply">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             回复
                             回复

+ 2 - 5
resources/views/tabler/admin/user/edit.tpl

@@ -12,15 +12,12 @@
                         <span class="home-subtitle">用户编辑</span>
                         <span class="home-subtitle">用户编辑</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a id="save_changes" href="#" class="btn btn-primary d-none d-sm-inline-block">
+                        <a id="save_changes" href="#" class="btn btn-primary">
                             <i class="icon ti ti-device-floppy"></i>
                             <i class="icon ti ti-device-floppy"></i>
                             保存
                             保存
                         </a>
                         </a>
-                        <a id="save_changes" href="#" class="btn btn-primary d-sm-none btn-icon">
-                            <i class="icon ti ti-device-floppy"></i>
-                        </a>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

+ 2 - 2
resources/views/tabler/admin/user/index.tpl

@@ -14,9 +14,9 @@
                         </span>
                         </span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#create-dialog">
                             data-bs-target="#create-dialog">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             创建
                             创建

+ 1 - 1
resources/views/tabler/tabler_header.tpl

@@ -10,7 +10,7 @@
     <title>{$config['appName']}</title>
     <title>{$config['appName']}</title>
     <!-- CSS files -->
     <!-- CSS files -->
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
-    <link href="//cdn.jsdelivr.net/npm/@tabler/icons@latest/iconfont/tabler-icons.min.css" rel="stylesheet" />
+    <link href="//cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css" rel="stylesheet" />
     <!-- JS files -->
     <!-- JS files -->
     <script src="/assets/js/fuck.min.js"></script>
     <script src="/assets/js/fuck.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>

+ 1 - 1
resources/views/tabler/user/edit.tpl

@@ -399,7 +399,7 @@
                                                     <h3 class="card-title">删除账户数据</h3>
                                                     <h3 class="card-title">删除账户数据</h3>
                                                 </div>    
                                                 </div>    
                                                 <div class="card-footer">
                                                 <div class="card-footer">
-                                                    <a href="#" class="btn btn-red d-none d-sm-inline-block" data-bs-toggle="modal"
+                                                    <a href="#" class="btn btn-red" data-bs-toggle="modal"
                                                         data-bs-target="#destroy-account">
                                                         data-bs-target="#destroy-account">
                                                         <i class="ti ti-trash icon"></i>
                                                         <i class="ti ti-trash icon"></i>
                                                         确认删除
                                                         确认删除

+ 5 - 0
resources/views/tabler/user/index.tpl

@@ -62,6 +62,11 @@
                                                 {$user->money}
                                                 {$user->money}
                                             </div>
                                             </div>
                                         </div>
                                         </div>
+                                        <div class="col-auto">
+                                            <a href="/user/money" class="btn btn-primary btn-icon">
+                                                <i class="ti ti-plus icon"></i>
+                                            </a>
+                                        </div>
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                             </div>
                             </div>

+ 26 - 3
resources/views/tabler/user/money.tpl

@@ -12,9 +12,9 @@
                         <span class="home-subtitle">查看账户余额变动记录</span>
                         <span class="home-subtitle">查看账户余额变动记录</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                            data-bs-target="#apply-giftcard-dialog">
                            data-bs-target="#apply-giftcard-dialog">
                             <i class="icon ti ti-cash-banknote"></i>
                             <i class="icon ti ti-cash-banknote"></i>
                             兑换礼品卡
                             兑换礼品卡
@@ -28,7 +28,7 @@
         <div class="container-xl">
         <div class="container-xl">
             <div class="row row-deck">
             <div class="row row-deck">
                 <div class="col-sm-12 col-lg-12">
                 <div class="col-sm-12 col-lg-12">
-                    <div class="card my-3">
+                    <div class="card">
                         <div class="card-header">
                         <div class="card-header">
                             <h3 class="card-title">账户余额记录</h3>
                             <h3 class="card-title">账户余额记录</h3>
                         </div>
                         </div>
@@ -70,6 +70,29 @@
         </div>
         </div>
     </div>
     </div>
 
 
+    <div class="modal modal-blur fade" id="apply-giftcard-dialog" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">兑换礼品卡</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group mb-3 row">
+                        <div class="col">
+                            <input id="giftcard" type="text" class="form-control" placeholder="输入礼品卡卡号并点击兑换">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn me-auto" data-bs-dismiss="modal">取消</button>
+                    <button id="apply-giftcard"
+                            type="button" class="btn btn-primary" data-bs-dismiss="modal">兑换</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <script>
     <script>
         $("#apply-giftcard").click(function() {
         $("#apply-giftcard").click(function() {
             $.ajax({
             $.ajax({

+ 2 - 2
resources/views/tabler/user/order/view.tpl

@@ -12,9 +12,9 @@
                         <span class="home-subtitle">订单详情</span>
                         <span class="home-subtitle">订单详情</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="/user/invoice/{$invoice->id}/view" targer="_blank" class="btn btn-primary d-none d-sm-inline-block">
+                        <a href="/user/invoice/{$invoice->id}/view" targer="_blank" class="btn btn-primary">
                             <i class="icon ti ti-file-dollar"></i>
                             <i class="icon ti ti-file-dollar"></i>
                             查看账单
                             查看账单
                         </a>
                         </a>

+ 1 - 1
resources/views/tabler/user/tabler_header.tpl

@@ -10,7 +10,7 @@
     <title>{$config['appName']}</title>
     <title>{$config['appName']}</title>
     <!-- CSS files -->
     <!-- CSS files -->
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
     <link href="//cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet" />
-    <link href="//cdn.jsdelivr.net/npm/@tabler/icons@latest/iconfont/tabler-icons.min.css" rel="stylesheet" />
+    <link href="//cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css" rel="stylesheet" />
     <!-- JS files -->
     <!-- JS files -->
     <script src="/assets/js/fuck.min.js"></script>
     <script src="/assets/js/fuck.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/qrcode_js@latest/qrcode.min.js"></script>
     <script src="//cdn.jsdelivr.net/npm/qrcode_js@latest/qrcode.min.js"></script>

+ 2 - 2
resources/views/tabler/user/ticket/index.tpl

@@ -12,9 +12,9 @@
                         <span class="home-subtitle">你可以在这里联系管理员获取支持</span>
                         <span class="home-subtitle">你可以在这里联系管理员获取支持</span>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <button href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <button href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#create-ticket">
                             data-bs-target="#create-ticket">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             创建工单
                             创建工单

+ 2 - 6
resources/views/tabler/user/ticket/view.tpl

@@ -13,17 +13,13 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 {if $ticket->status !== 'closed'}
                 {if $ticket->status !== 'closed'}
-                <div class="col-auto ms-auto d-print-none">
+                <div class="col-auto">
                     <div class="btn-list">
                     <div class="btn-list">
-                        <a href="#" class="btn btn-primary d-none d-sm-inline-block" data-bs-toggle="modal"
+                        <a href="#" class="btn btn-primary" data-bs-toggle="modal"
                             data-bs-target="#add-reply">
                             data-bs-target="#add-reply">
                             <i class="icon ti ti-plus"></i>
                             <i class="icon ti ti-plus"></i>
                             添加回复
                             添加回复
                         </a>
                         </a>
-                        <a href="#" class="btn btn-primary d-sm-none btn-icon" data-bs-toggle="modal"
-                            data-bs-target="#add-reply" aria-label="Create new report">
-                            <i class="icon ti ti-plus"></i>
-                        </a>
                     </div>
                     </div>
                 </div>
                 </div>
                 {/if}
                 {/if}

+ 5 - 0
src/Controllers/User/MoneyController.php

@@ -7,6 +7,7 @@ namespace App\Controllers\User;
 use App\Controllers\BaseController;
 use App\Controllers\BaseController;
 use App\Models\GiftCard;
 use App\Models\GiftCard;
 use App\Models\UserMoneyLog;
 use App\Models\UserMoneyLog;
+use App\Utils\Tools;
 use Exception;
 use Exception;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\Response;
@@ -27,6 +28,10 @@ final class MoneyController extends BaseController
         $user = $this->user;
         $user = $this->user;
         $moneylogs = UserMoneyLog::where('user_id', $user->id)->orderBy('id', 'desc')->get();
         $moneylogs = UserMoneyLog::where('user_id', $user->id)->orderBy('id', 'desc')->get();
 
 
+        foreach ($moneylogs as $moneylog) {
+            $moneylog->create_time = Tools::toDateTime($moneylog->create_time);
+        }
+
         return $response->write(
         return $response->write(
             $this->view()
             $this->view()
                 ->assign('moneylogs', $moneylogs)
                 ->assign('moneylogs', $moneylogs)