Add #38， 修改 IP记录格式， 修改 在线支付判断 减少误判

app/Components/Helpers.php

@@ -147,7 +147,7 @@ class Helpers
     public static function cacheSysConfig($name)
     {
         if ($name === 'is_onlinePay') {
-            $value = ! empty(array_filter(Cache::tags('sysConfig')->many(['is_AliPay', 'is_QQPay', 'is_WeChatPay', 'is_otherPay'])));
+            $value = sysConfig('is_AliPay') || sysConfig('is_QQPay') || sysConfig('is_WeChatPay') || sysConfig('is_otherPay');
             Cache::tags('sysConfig')->put('is_onlinePay', $value);
         } else {
             $value = Config::find($name)->value;

app/Components/IP.php

@@ -63,13 +63,15 @@ class IP
                 'country'  => $location[0] ?: '',
                 'province' => $location[2] ?: '',
                 'city'     => $location[3] ?: '',
+                'isp'      => $location[4] ?: '',
+                'area'     => $location[1] ?: '',
             ];
         }
 
         return $ipInfo;
     }
 
-    //// 通过ip2Location查询IP地址的详细信息
+    // 通过ip2Location查询IP地址的详细信息
     public static function ip2Location(string $ip)
     {
         $filePath = database_path('IP2LOCATION-LITE-DB3.IPV6.BIN');
@@ -115,6 +117,7 @@ class IP
                     'country'  => $message['data']['country'] === 'XX' ? '' : $message['data']['country'],
                     'province' => $message['data']['region'] === 'XX' ? '' : $message['data']['region'],
                     'city'     => $message['data']['city'] === 'XX' ? '' : $message['data']['city'],
+                    'isp'      => $message['data']['isp'] === 'XX' ? '' : $message['data']['isp'],
                 ];
             }
 
@@ -144,6 +147,7 @@ class IP
                     'country'  => $message['content']['address_detail']['country'],
                     'province' => $message['content']['address_detail']['province'],
                     'city'     => $message['content']['address_detail']['city'],
+                    'area'     => $message['address'],
                 ];
             }
 

resources/views/user/index.blade.php

@@ -111,13 +111,20 @@
                             <span class="font-weight-400 mb-10">{{trans('home.account_last_login')}}</span>
                             <ul class="list-group list-group-dividered px-20 mb-0">
                                 <li class="list-group-item px-0">
-                                    <i class="icon wb-time"></i>时间：{{date_format($userLoginLog->created_at,'Y/m/d H:i')}}
+                                    <i class="icon wb-time"></i>
+                                    时间：{{date_format($userLoginLog->created_at,'Y/m/d H:i')}}
                                 </li>
-                                <li class="list-group-item px-0"><i class="icon wb-code"></i>IP地址：{{$userLoginLog->ip}}
+                                <li class="list-group-item px-0">
+                                    <i class="icon wb-code"></i>
+                                    IP地址：{{$userLoginLog->ip}}
                                 </li>
-                                <li class="list-group-item px-0"><i class="icon wb-cloud"></i>运营商：{{$userLoginLog->isp}}
+                                <li class="list-group-item px-0">
+                                    <i class="icon wb-cloud"></i>
+                                    运营商：{{$userLoginLog->isp}}
                                 </li>
-                                <li class="list-group-item px-0"><i class="icon wb-map"></i>地区：{{$userLoginLog->area}}
+                                <li class="list-group-item px-0">
+                                    <i class="icon wb-map"></i>
+                                    地区：{{$userLoginLog->area ?: $userLoginLog->country.' '.$userLoginLog->province.' '.$userLoginLog->city}}
                                 </li>
                             </ul>
                         </div>

resources/views/user/layouts.blade.php

@@ -161,10 +161,18 @@
                     <span class="site-menu-title">{{trans('home.help')}}</span>
                 </a>
             </li>
+            @php
+                $openTicket = App\Models\Ticket::uid()->whereStatus(1)->count()
+            @endphp
             <li class="site-menu-item {{request()->routeIs('ticket', 'replyTicket') ? 'active open' : ''}}">
                 <a href="{{route('ticket')}}">
                     <i class="site-menu-icon wb-chat-working" aria-hidden="true"></i>
                     <span class="site-menu-title">{{trans('home.ticket_title')}}</span>
+                    @if($openTicket > 0)
+                        <div class="site-menu-badge">
+                            <span class="badge badge-pill badge-success">{{$openTicket}}</span>
+                        </div>
+                    @endif
                 </a>
             </li>
             <li class="site-menu-item {{request()->routeIs('invoice', 'invoiceInfo') ? 'active open' : ''}}">