xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/user' into develop_bm

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-21 10:15:55 +08:00
parent 220f1df6ca bf0e385a59
commit 68ff8caa41
9 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crmAdmin/service/CustomerService.php
+1 -2
View File
@@ -135,7 +135,6 @@ class CustomerService
foreach ($customer as &$item) {
$item = $this->getCustomer($item);
$item['desc_collect'] = $item['desc_collect'] ?? '';
$item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']);
if ($seas == 'seas' || $scene == 'seas') {
$item['seas_time'] = time() - (empty($item['deleted_at'])?strtotime($item['updated_at']):strtotime($item['deleted_at']));
}
@@ -427,7 +426,7 @@ class CustomerService
// $customer['created_at'] = Util::timeTotDate($customer['created_at']);
// $customer['updated_at'] = Util::timeTotDate($customer['updated_at']);
$customer = Util::formatDate($customer, ['follow_last']);
$customer = Util::formatDate($customer, ['follow_next','follow_last']);
$nameLang = $language == 'en' ? 'name_en' : ($language == 'ru' ? 'name_ru' : '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);