From 8148e8437356d5b724ec9d330191be29c8b63474 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Sat, 3 May 2025 15:09:03 +0800
Subject: [PATCH] no message

---
 resources/views/tabler/user/order/create.tpl | 21 ++++++++++++++++++--
 src/Controllers/User/OrderController.php     |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/resources/views/tabler/user/order/create.tpl b/resources/views/tabler/user/order/create.tpl
index f6f66519..de426f71 100755
--- a/resources/views/tabler/user/order/create.tpl
+++ b/resources/views/tabler/user/order/create.tpl
@@ -32,26 +32,32 @@
                                     <td id="product-id" class="text-end">{$product->id}</td>
                                 </tr>
                                 <tr>
-                                    <td>商品名称</td>
+                                    <td>套餐名称</td>
                                     <td class="text-end">{$product->name}</td>
                                 </tr>
+                                <!--
                                 <tr>
                                     <td>商品类型</td>
                                     <td class="text-end">{$product->type_text}</td>
                                 </tr>
+                                -->
                                 {if $product->type === 'tabp' || $product->type === 'time'}
+                                <!--
                                     <tr>
                                         <td>商品时长</td>
                                         <td class="text-end">{$product->content->time} 天</td>
                                     </tr>
+                                -->
                                     <tr>
-                                        <td>等级时长</td>
+                                        <td>套餐时长</td>
                                         <td class="text-end">{$product->content->class_time} 天</td>
                                     </tr>
+                                <!--
                                     <tr>
                                         <td>等级</td>
                                         <td class="text-end">Lv. {$product->content->class}</td>
                                     </tr>
+                                -->
                                 {/if}
                                 {if $product->type === 'tabp' || $product->type === 'bandwidth'}
                                     <tr>
@@ -77,6 +83,17 @@
                                         {/if}
                                     </tr>
                                 {/if}
+                                {if $product->huodong }
+                                    {if $product->huodong->class == A }
+                                        {if $product->content->class_time > 32}
+                                            <tr>
+                                                <td colspan="2">
+                                                <span style="background-color: #eccafa;">此商品正在参加{$product->huodong->title}：{$product->huodong->content}</span>
+                                                </td>
+                                            </tr>
+                                        {/if}
+                                    {/if}
+                                {/if}
                             </table>
                         </div>
                     </div>
diff --git a/src/Controllers/User/OrderController.php b/src/Controllers/User/OrderController.php
index 8e0fbf4f..091cae69 100755
--- a/src/Controllers/User/OrderController.php
+++ b/src/Controllers/User/OrderController.php
@@ -71,6 +71,10 @@ final class OrderController extends BaseController
         $product = (new Product())->where('id', $product_id)->first();
         $product->type_text = $product->type();
         $product->content = json_decode($product->content);
+        
+        $oHuodong = Huodong::dateHit();
+//        $oHuodong = Huodong::dateHit("2025-01-01");
+        $product->huodong = $oHuodong;
 
         return $response->write(
             $this->view()