gq 7 年之前
父節點
當前提交
f4b471f49d

+ 2 - 1
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -224,7 +224,8 @@ class AuthController extends Controller
                     'password'=>bcrypt(123456)
                 ]);
             }
-            return $this->api(['openid' => $openid]);
+//            return $this->api(['openid' => $openid]);
+            return $this->api(['wechat' => $openid]);
         }else{
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'openid','token'));

+ 1 - 0
server/app/Http/Controllers/Api/V1/MyController.php

xqd
@@ -260,6 +260,7 @@ class MyController extends Controller
         $user = $this->getUser();
         $data1  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',1)->orderBy('id','desc')->get()->toArray();
         $new_data1 = [] ;
+//        取消合并
        /* if (count($data1) > 0) {
             if (count($data1) >= 5) {
                 $data1[0]['message'] = "已经有".count($data1)."个人支持了你的梦想!";