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 @@
{$product->id} |
- | 商品名称 |
+ 套餐名称 |
{$product->name} |
+
{if $product->type === 'tabp' || $product->type === 'time'}
+
- | 等级时长 |
+ 套餐时长 |
{$product->content->class_time} 天 |
+
{/if}
{if $product->type === 'tabp' || $product->type === 'bandwidth'}
@@ -77,6 +83,17 @@
{/if}
{/if}
+ {if $product->huodong }
+ {if $product->huodong->class == A }
+ {if $product->content->class_time > 32}
+
+ |
+ 此商品正在参加{$product->huodong->title}:{$product->huodong->content}
+ |
+
+ {/if}
+ {/if}
+ {/if}
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()