github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

Browse Source
This commit is contained in:
liaofei 2022-08-24 12:19:43 +08:00
commit cf179bebfa
3 changed files with 4767 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,7 +7,6 @@
/crmeb/runtime/session
/crmeb/runtime/temp
/crmeb/public/uploads
/crmeb/app/adminapi/controller/UpgradeController.php
/crmeb/app/adminapi/controller/v1/statistic/BalanceStatistic.php
/crmeb/app/adminapi/controller/v1/statistic/OrderStatistic.php
/crmeb/app/adminapi/controller/v1/statistic/ProductStatistic.php

4766
crmeb/app/adminapi/controller/UpgradeController.php Normal file
View File

File diff suppressed because one or more lines are too long

2
crmeb/app/services/user/UserServices.php
View File

@ -1512,7 +1512,7 @@ class UserServices extends BaseServices
$user['extract_type'] = sys_config('extract_type');
$user['integral'] = intval($user['integral']);
$user['is_agent_level'] = $agentLevelServices->count(['status' => 1, 'is_del' => 0]) > 0 ? 1 : 0;
$user['division_open'] = (int)sys_config('division_status', 1);
$user['division_open'] = (int)sys_config('division_status', 0);
$user['avatar'] = strpos($user['avatar'], '/statics/system_images/') !== false ? set_file_url($user['avatar']) : $user['avatar'];
return $user;
}