| xqd
@@ -564,11 +564,13 @@ class AlbumController extends Controller
|
|
|
$goods->price = $price->price;
|
|
|
$goods->mobile = $price->mobile;
|
|
|
$address = AlbumAgentModel::where('id',$userAuth->up_agent_id)->first();
|
|
|
- $goods->address = $address;
|
|
|
+ $goods->address = $address->address;
|
|
|
+ $goods->realname = $address->realname;
|
|
|
}else{
|
|
|
$goods->price = '';
|
|
|
$goods->mobile = '';
|
|
|
$goods->address = '';
|
|
|
+ $goods->realname = '';
|
|
|
}
|
|
|
$check_favorite = AlbumFavoriteModel::where([['user_id',$userAuth->id],['store_id',$store_id],['product_id',$goods['id']]])->first();
|
|
|
//dd($check_favorite);
|
| xqd
@@ -593,6 +595,7 @@ class AlbumController extends Controller
|
|
|
$goods->price = '';
|
|
|
$goods->mobile = '';
|
|
|
$goods->address = '';
|
|
|
+ $goods->realname = '';
|
|
|
}
|
|
|
$goods->is_favorite = 0;
|
|
|
$goods->favorite_id = '';
|
| xqd
@@ -1687,8 +1690,13 @@ class AlbumController extends Controller
|
|
|
{
|
|
|
$userAuth = Auth('api')->user();
|
|
|
if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
|
|
|
- $user_agent = AlbumAgentModel::where('user_id',$userAuth->id)->first();
|
|
|
- $agent_id = $user_agent['id'];
|
|
|
+ if($userAuth->up_agent_id == 0){
|
|
|
+ $user_agent = AlbumAgentModel::where('user_id',$userAuth->id)->first();
|
|
|
+ $agent_id = $user_agent['id'];
|
|
|
+ }else{
|
|
|
+ $agent_id = $userAuth->up_agent_id;
|
|
|
+ }
|
|
|
+
|
|
|
$banner = AgentBannerModel::where([['agent_id',$agent_id],['type',0]])->get();
|
|
|
$video = AgentBannerModel::where([['agent_id',$agent_id],['type',1]])->first();
|
|
|
return $this->api(compact('banner','video'));
|