|
|
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\v1;
|
|
|
|
|
|
use App\Http\Controllers\Api\webApp;
|
|
|
use App\Services\Api\MemberService;
|
|
|
+use App\Services\MpService;
|
|
|
use Illuminate\Http\Request;
|
|
|
|
|
|
/**
|
|
|
@@ -76,51 +77,29 @@ class MemberController extends webApp
|
|
|
return showJson(1046, false, $error);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
- * 更新修改头像
|
|
|
+ * 获取手机号
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function setAvatar(Request $request)
|
|
|
+ public function getPhoneNumber()
|
|
|
{
|
|
|
- // 上传单图统一调取方法
|
|
|
- ob_clean();
|
|
|
- $result = upload_image($request, 'file', 'avatar');
|
|
|
- if (!$result['success']) {
|
|
|
- return showJson($result['msg'], false, ['url' => '']);
|
|
|
- }
|
|
|
-
|
|
|
- // 文件路径
|
|
|
- $file_path = $result['data']['img_path'];
|
|
|
- if (!$file_path) {
|
|
|
- return showJson('上传失败', false, ['url' => '']);
|
|
|
- }
|
|
|
-
|
|
|
- // 网络域名拼接
|
|
|
- if ($file_path && strpos($file_path, IMG_URL) === false) {
|
|
|
- $file_path = get_image_url($file_path);
|
|
|
- }
|
|
|
-
|
|
|
- $avatar = $result['data']['img_path'];
|
|
|
- if (MemberService::make()->saveAvatar($this->userId, $avatar)) {
|
|
|
- return showJson(1013, true, ['url' => $file_path, 'path' => $avatar]);
|
|
|
- } else {
|
|
|
- return showJson(1014, false, ['url' => '']);
|
|
|
- }
|
|
|
- }
|
|
|
+ try {
|
|
|
+ $code = request()->post('code','');
|
|
|
+ if(empty($code)){
|
|
|
+ return showJson('请先授权获取手机号', false);
|
|
|
+ }
|
|
|
|
|
|
- /**
|
|
|
- * 修改账号信息
|
|
|
- * @return array
|
|
|
- */
|
|
|
- public function modify()
|
|
|
- {
|
|
|
- $params = request()->all();
|
|
|
- if (!MemberService::make()->modify($this->userId, $params)) {
|
|
|
- return showJson(MemberService::make()->getError(), false);
|
|
|
- } else {
|
|
|
- return showJson(1013, true);
|
|
|
+ $phoneData = MpService::make()->getPhoneNumber($code);
|
|
|
+ $phoneData = isset($phoneData['phone_info']) ? $phoneData['phone_info'] : [];
|
|
|
+ $phone = isset($phoneData['phoneNumber']) ? $phoneData['phoneNumber'] : '';
|
|
|
+ if (!$phone) {
|
|
|
+ return showJson(MpService::make()->getError(), false);
|
|
|
+ } else {
|
|
|
+ return showJson(1010, true, ['mobile'=>$phone]);
|
|
|
+ }
|
|
|
+ } catch (\Exception $exception){
|
|
|
+ $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
|
|
|
+ return showJson(1046, false, $error);
|
|
|
}
|
|
|
}
|
|
|
|