gq 7 سال پیش
والد
کامیت
7436bd89da

+ 1 - 0
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd
@@ -68,6 +68,7 @@ class InfoController extends Controller
     private function _createSave(){
         $data = (array) request('data');
         $pics = (array) request('pic');
+        dd($pics);
         if (empty($pics)) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
             return $this->showWarning('请添加图片',$url);

+ 11 - 5
server/app/Http/Controllers/Api/V1/AuthController.php

xqd xqd xqd xqd
@@ -30,7 +30,7 @@ class AuthController extends Controller
      * @apiPermission none
      * @apiVersion 0.1.0
      * @apiParam {string}  phone    手机号码
-     * @apiParam {string}  [wechat]    微信openid
+     * @apiParam {string}  wechat   微信openid
      * @apiParam {String}  verify_code  手机验证码
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -70,10 +70,12 @@ class AuthController extends Controller
     public function login(Request $request) {
         $validator = Validator::make($request->all(),
             [
+                'wechat'      => 'required',
                 'phone'         => 'required|regex:/^1[34578]\d{9}$/',
                 'verify_code'      => 'required',
             ],
             [
+                'wechat.required'      => '请先绑定微信',
                 'phone.required'        => '请输入手机号码',
                 'phone.regex'           => '手机号码格式不正确',
                 'verify_code.required'      => '短信验证码必填',
@@ -82,7 +84,6 @@ class AuthController extends Controller
 
         if ($validator->fails())
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
         $phone = $request->phone;
         $wechat = $request->wechat;
         $key = $this->keySmsCode . $phone;
@@ -91,17 +92,22 @@ class AuthController extends Controller
         if ($request->verify_code != $code) return $this->error(ErrorCode::SERVICE_CODE_FAILED);
         $user = UserInfoModel::where('phone',$phone)->first();
         if (empty($user)) {
-            $user = UserInfoModel::create(['phone'=>$phone,'password'=>bcrypt(123456)]);
+            $user = UserInfoModel::create([
+                'phone'=>$phone,
+                'wechat'=>$wechat,
+                'password'=>bcrypt(123456)
+            ]);
             $user->status=1;
+            $user->save();
         }
         $status =empty($user) ? 0 : $user->status;
         if ($status == 0) return $this->error(ErrorCode::LOCK_USER);
         if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
             $user = Auth::user();
-            if (!empty($wechat)) {
+         /*   if (!empty($wechat)) {
                 $user->wechat =$wechat;
                 $user->save();
-            }
+            }*/
             \Log::info($user);
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'code','token'));

+ 1 - 0
server/app/Models/UserInfoModel.php

xqd
@@ -53,6 +53,7 @@ class UserInfoModel extends Authenticatable
                            'status',
                            'remember_token',
                            'birthday',
+                           'wechat',
                           ];
 
     protected $hidden = ['password'];