|
@@ -167,19 +167,24 @@ class AlbumBossController extends Controller
|
|
if ($i >= (($data['pageNum'] - 1) * 20) && $i < ($data['pageNum'] * 20)) {
|
|
if ($i >= (($data['pageNum'] - 1) * 20) && $i < ($data['pageNum'] * 20)) {
|
|
$user = AlbumUserModel::where('open_id', $value->open_id)->first(['avatar', 'username', 'address']);
|
|
$user = AlbumUserModel::where('open_id', $value->open_id)->first(['avatar', 'username', 'address']);
|
|
$userComment = CustomerDetailsModel::where('open_id', $value->open_id)->first(['comment']);
|
|
$userComment = CustomerDetailsModel::where('open_id', $value->open_id)->first(['comment']);
|
|
|
|
+ if (empty($user->phone)) {
|
|
|
|
+ $phone = '暂无';
|
|
|
|
+ } else {
|
|
|
|
+ $phone = $user->phone;
|
|
|
|
+ }
|
|
if (!$userComment) {
|
|
if (!$userComment) {
|
|
$customer[] = [
|
|
$customer[] = [
|
|
'name' => '暂无',
|
|
'name' => '暂无',
|
|
'avatar' => $user->avatar,
|
|
'avatar' => $user->avatar,
|
|
'username' => $user->username,
|
|
'username' => $user->username,
|
|
- 'address' => $user->address
|
|
|
|
|
|
+ 'phone' => $phone
|
|
];
|
|
];
|
|
} else {
|
|
} else {
|
|
$customer[] = [
|
|
$customer[] = [
|
|
'name' => $userComment->comment,
|
|
'name' => $userComment->comment,
|
|
'avatar' => $user->avatar,
|
|
'avatar' => $user->avatar,
|
|
'username' => $user->username,
|
|
'username' => $user->username,
|
|
- 'address' => $user->address
|
|
|
|
|
|
+ 'phone' => $phone
|
|
];
|
|
];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -914,6 +919,7 @@ class AlbumBossController extends Controller
|
|
foreach ($agent as $value) {
|
|
foreach ($agent as $value) {
|
|
$user = AlbumUserModel::where([['id', $value->user_id], ['store_id', $store_id]])->first(['avatar']);
|
|
$user = AlbumUserModel::where([['id', $value->user_id], ['store_id', $store_id]])->first(['avatar']);
|
|
$value->avatar = $user->avatar;
|
|
$value->avatar = $user->avatar;
|
|
|
|
+
|
|
}
|
|
}
|
|
return $this->api($agent);
|
|
return $this->api($agent);
|
|
}
|
|
}
|