xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用fdesk库

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-07-23 16:55:18 +08:00
parent fa4ade4b35
commit ef66ecbbef
13 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/CustomerController.php
+14 -7
View File
@@ -31,9 +31,12 @@ class CustomerController
{
$grade = [];
$gradeConstants = Constants::GRADE_EN;
if($request->user['language'] == 'zh_CN'){
//$language = $request->user['language'];
$language = 'zh_CN';
if($language == 'zh_CN'){
$gradeConstants = Constants::GRADE;
}elseif ($request->user['language'] == 'ru'){
}elseif ($language == 'ru'){
$gradeConstants = Constants::GRADE_RU;
}
foreach ($gradeConstants as $key => $value) {
@@ -54,9 +57,11 @@ class CustomerController
{
$grade = [];
$magnitudeConstants = Constants::MAGNITUDE_EN;
if($request->user['language'] == 'zh_CN'){
//$language = $request->user['language'];
$language = 'zh_CN';
if($language == 'zh_CN'){
$magnitudeConstants = Constants::MAGNITUDE;
}elseif ($request->user['language'] == 'ru'){
}elseif ($language == 'ru'){
$magnitudeConstants = Constants::MAGNITUDE_RU;
}
foreach ($magnitudeConstants as $key => $value) {
@@ -77,11 +82,13 @@ class CustomerController
{
$list = Channel::getAll();
if($request->user['language'] != 'zh_CN'){
//$language = $request->user['language'];
$language = 'zh_CN';
if($language != 'zh_CN'){
foreach ($list as &$value) {
$value['name'] = $value['name_en'];
}
}elseif ($request->user['language'] == 'ru'){
}elseif ($language == 'ru'){
foreach ($list as &$value) {
$value['name'] = $value['name_ru'];
}
@@ -178,7 +185,7 @@ class CustomerController
// 执行分页查询 //关联标签tags //关联标签及分组tags.group
$query = Customer::with('tags')->where($where)
->orderBy('customer.id', 'desc');
->orderBy('crm_customer.id', 'desc');
if(!empty($tagId)){
// $query->with(['tags' => function($query) use ($tagId){
// $query->where('tag.id', $tagId);