diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index e8e12c7..3e43cfd 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -225,9 +225,6 @@ class CustomerController $query->withTrashed(); } - $sql = str_replace(['?'], ['\'%s\''], $query->toSql()); - $fullSql = vsprintf($sql, $query->getBindings()); - var_dump($fullSql); $data = $query->paginate($perPage, ['*'], 'page', $page); foreach ($data->items() as &$value) { @@ -236,7 +233,7 @@ class CustomerController $value['phone'] = Util::mask($value['phone']); $value['email'] = Util::mask($value['email']); $value['WhatsApp'] = Util::mask($value['WhatsApp']); - $value['seas_time'] = time()-strtotime($value['deleted_at']); + $value['seas_time'] = time()-(empty($value['deleted_at'])?strtotime($value['updated_at']):strtotime($value['deleted_at'])); } } diff --git a/app/model/Customer.php b/app/model/Customer.php index 81960c4..34c0844 100644 --- a/app/model/Customer.php +++ b/app/model/Customer.php @@ -99,6 +99,7 @@ class Customer extends Model $customer = Util::formatDate($customer,['follow_last']); $nameLang = $language=='en'?'name_en':($language=='ru'?'name_ru':'name'); + $nameLang = 'name'; $countryLang = $language=='en'?'en_addr':'cn_addr'; $customer['car_type_name'] = empty($customer['car_type_id'])?'':CarType::where(['id'=>$customer['car_type_id']])->value($nameLang); $customer['country_name'] = empty($customer['country_id'])?'':Country::where(['id'=>$customer['country_id']])->value($countryLang); diff --git a/app/util/Util.php b/app/util/Util.php index ec8e637..9434e9c 100644 --- a/app/util/Util.php +++ b/app/util/Util.php @@ -123,11 +123,7 @@ class Util if(empty($str)){ return ''; } - // 只对 11 位手机号进行脱敏,中间 4 位用 * 替换 - if (preg_match('/^1[3-9]\d{9}$/', $str)) { - return substr($str, 0, 3) . '****' . substr($str, -4); - } - return $str; + return substr($str, 0, 3) . '****' . substr($str, -4); } } \ No newline at end of file