Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Api/V1/AuthController.php

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

server/app/Http/Controllers/Api/V1/MyController.php

@@ -260,7 +260,8 @@ 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) > 0) {
             if (count($data1) >= 5) {
                 $data1[0]['message'] = "已经有".count($data1)."个人支持了你的梦想！";
                 $data2[0]['is_url'] = 1;
@@ -269,7 +270,8 @@ class MyController extends Controller
             }else{
                 $new_data1 = $data1;
             }
-        }
+        }*/
+        $new_data1 = $data1;
         $data2  =  SystemInfoModel::where('to_user_id',$user->id)->where('type_id',1)->where('attr_id',2)->orderBy('id','desc')->get()->toArray();
         $new_data2 = [] ;
         if (count($data2) > 0) {
@@ -871,6 +873,15 @@ class MyController extends Controller
                 }*/
                 $item->img;
                 $item->user;
+                if (strtotime($item->end_time) > time()) {
+                    $item->type_name = '进行中';
+                }else{
+                    if ($item->get_coin >=$item->coin) {
+                        $item->type_name = '已完成';
+                    }else{
+                        $item->type_name = '未完成';
+                    }
+                }
             }
             return $this->api(compact('dreams'));
         }