Merge commit '145d4c57f471b222e1ad3dac9c7436c23648698b' into dev

app/process/CreateTables.php

@@ -19,7 +19,7 @@ class CreateTables
 
     protected function initStart()
     {
-        echo "开始创建表\n";
+        echo date("H:i") . " 开始创建表\n";
 
         $centerTablesSqlList = [
             $this->base_total_day,

app/v1/logic/dataReport/WelcomeLogic.php

@@ -98,12 +98,10 @@ class WelcomeLogic extends BaseLogic
           ->group('tdate')
           ->select()->toArray();
 
-
-        $temp = $baseTotal;
-        foreach($temp as $tmp){
-            $res[$tmp['tdate']]['reg'] = $tmp['reg'];
-            $res[$tmp['tdate']]['pay'] = $tmp['pay'];
-            $res[$tmp['tdate']]['login'] = $tmp['login'];
+        foreach($baseTotal as $v){
+            $res[$v['tdate']]['reg'] = $v['reg'];
+            $res[$v['tdate']]['pay'] = $v['pay'];
+            $res[$v['tdate']]['login'] = $v['login'];
         }
 
         $costField = [
@@ -124,10 +122,10 @@ class WelcomeLogic extends BaseLogic
         }
         foreach($days as $k=>$d){
             $data['days'][$k] = $d;
-            $data['reg'][$k]  = $res[$d]['reg']??0+0;
-            $data['pay'][$k]  = $res[$d]['pay']??0+0;
-            $data['cost'][$k] = round($res[$d]['cost']??0+0);
-            $data['login'][$k]= $res[$d]['login']??0+0;
+            $data['reg'][$k]  = $res[$d]['reg']??0;
+            $data['pay'][$k]  = $res[$d]['pay']??0;
+            $data['cost'][$k] = round($res[$d]['cost']??0);
+            $data['login'][$k]= $res[$d]['login']??0;
         }
         return $data;
 

plugin/saiadmin/basic/BaseLogic.php

@@ -286,7 +286,7 @@ class BaseLogic
             }
 
             if (in_array('ip', $fields)) {
-                $value['ip'] = getIpLocation($value['ip']) ?? '';
+                $value['ip'] = $value['ip'] ? $value['ip'] ."(". getIpLocation($value['ip']) .")" : '';
             }
         }
         unset($value);