|
|
@@ -1093,7 +1093,11 @@ class Auth extends BaseController
|
|
1093
|
1093
|
$user->append(['service', 'user_group','total_consume', 'total_collect_product', 'total_collect_store', 'total_coupon', 'total_visit_product', 'total_unread']);
|
|
1094
|
1094
|
$userInfo = $user->toArray();
|
|
1095
|
1095
|
|
|
1096
|
|
- $data['mweb_info'] = $this->curl_java_login($userInfo['phone'])['data'];
|
|
|
1096
|
+ $temp = $this->curl_java_login($userInfo['phone']);
|
|
|
1097
|
+ $data['mweb_info'] = [];
|
|
|
1098
|
+ if(isset($temp['data'])){
|
|
|
1099
|
+ $data['mweb_info'] = $temp['data'];
|
|
|
1100
|
+ }
|
|
1097
|
1101
|
$data['merchant_info'] = [];
|
|
1098
|
1102
|
|
|
1099
|
1103
|
return app('json')->success($data);
|