no message

app/Services/HolidayWheelService.php

@@ -25,7 +25,11 @@ class HolidayWheelService
         $status = 0;
         $startTime = null;
         $endTime = null;
-        $iconUrl = '';
+        $logo = '';
+        $button_url = '';
+        $button_light_url = '';
+        $lunzi_url = '';
+        $dipan_url = '';
         // 默认规则从活动配置 + 商城档位中计算（包含金额、次数和档位信息）
         $rechargeRules = $this->getDefaultRechargeRules();
 
@@ -33,7 +37,11 @@ class HolidayWheelService
             $status = (int)($activity->status ?? 0);
             $startTime = $activity->start_time;
             $endTime = $activity->end_time;
-            $iconUrl = $activity->icon_url ?? '';
+            $logo = $activity->icon_url ?? '';
+            $button_url = $activity->button_url ?? '';
+            $button_light_url = $activity->button_light_url ?? '';
+            $lunzi_url = $activity->lunzi_url ?? '';
+            $dipan_url = $activity->dipan_url ?? '';
 
             // 如果当前时间不在活动时间范围内，则前端状态强制视为关闭（0）
             if (!empty($startTime) && $now->lt($startTime)) {
@@ -68,7 +76,12 @@ class HolidayWheelService
             'status' => $status,
             'start_time' => $startTime,
             'end_time' => $endTime,
-            'icon_url' => $iconUrl,
+            'logo_url' => $logo,
+            'button_url' => $button_url,
+            'button_light_url' => $button_light_url,
+            'lunzi_url' => $lunzi_url,
+            'dipan_url' => $dipan_url,
+
             'slots' => $slots,
             'user' => [
                 'left_times' => $leftTimes,

resources/views/admin/recharge/list.blade.php

@@ -195,14 +195,13 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-
                                 @if (hidden() != 'service')
                                     <div>
                                         @if (!empty($chargeMoney))
                                            <h4> {{$chargeMoney}} {{ __('auto.档位') }}</h4>
                                         @endif
-{{--                                        <h4>{{ __('auto.总金额：') }}{{$totalMoney}} &nbsp;&nbsp; {{$payTotalMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payTotalMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>--}}
-{{--                                        <h4>{{ __('auto.已到账：') }}{{$overMoney}} &nbsp;&nbsp;{{$payOverMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payOverMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>--}}
+                                        <h4>{{ __('auto.总金额：') }}{{$totalMoney}} &nbsp;&nbsp; {{$payTotalMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payTotalMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>
+                                        <h4>{{ __('auto.已到账：') }}{{$overMoney}} &nbsp;&nbsp;{{$payOverMoney->count_u ?? 0}}{{ __('auto.人') }}&nbsp;&nbsp;{{$payOverMoney->count_id ?? 0}}{{ __('auto.笔') }}</h4>
                                     </div>
                                 @endif