mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '修复异常' (#10) from dev into master

Browse Source 
Reviewed-on: #10
This commit is contained in:
mkm 2023-09-06 15:10:17 +08:00
commit 12235405be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/Auth.php
View File

@ -211,9 +211,9 @@ class Auth extends BaseController
if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
$data['is_wsxx'] = 1;
}
$mer_arr['type_code'] = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'])->value('type_code');
$data['mer_info'] = $mer_arr;
}
$typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'])->value('type_code');
$data['mer_info']['type_code'] = $typCode;
$data['fan_num'] = app()->make(RelevanceRepository::class)->getUserFans($user->uid, 1, 1, 1);
$data['focus_num'] = app()->make(RelevanceRepository::class)->getUserFocus($user->uid, 1, 1, 1);
$data['community_num'] = Db::name('community')->where('uid', $user->uid)->whereIn('is_type', '1,2')->count();