diff --git a/resources/views/system/addedit.blade.php b/resources/views/system/addedit.blade.php index 99ec9d0..1ff1f8d 100644 --- a/resources/views/system/addedit.blade.php +++ b/resources/views/system/addedit.blade.php @@ -506,8 +506,8 @@ use App\Models\Address; @foreach ($x as $oo) - {{ $oo->recv_pkt }} - {{ $oo->recv_at }} + $oo->recv_pkt])>{{ $oo->recv_pkt ?: '-' }} + {{ $oo->recv_at ?: '-' }} {{ $oo->count }} @endforeach diff --git a/resources/views/widgets/packet.blade.php b/resources/views/widgets/packet.blade.php index 2c4e426..32be2b6 100644 --- a/resources/views/widgets/packet.blade.php +++ b/resources/views/widgets/packet.blade.php @@ -18,11 +18,13 @@ {{ $oo->fftn->ftn }} {{ $oo->tftn->ftn }} - @if ($oo->msgid) - {{ $oo->msgid }} - @else - [{{ $oo->id }}] - @endif + + @if ($oo->msgid) + {{ $oo->msgid }} + @else + [{{ $oo->id }}] + @endif + {{ $oo->datetime }} @@ -49,7 +51,7 @@ @foreach ($em as $oo) {{ $oo->fftn->ftn }} - {{ $oo->msgid }} + {{ $oo->msgid }} {{ $oo->echoarea->name }} {{ $oo->datetime }} diff --git a/routes/web.php b/routes/web.php index 3eb3619..e8d8d74 100644 --- a/routes/web.php +++ b/routes/web.php @@ -131,7 +131,7 @@ Route::middleware(['auth','verified','activeuser'])->group(function () { Route::match(['get','post'],'link',[UserController::class,'link']); Route::post('packet/contents/{o}/{packet}',[HomeController::class,'packet_contents']) ->where('o','[0-9]+') - ->where('packet','[[:xdigit:]]+'); + ->where('packet','[0-9a-zA-Z]+'); Route::match(['get','post'],'user/system/register',[SystemController::class,'register']); Route::match(['post'],'user/system/link',[SystemController::class,'system_link']);