| xqd
@@ -313,11 +313,12 @@ class MyController extends Controller
|
|
|
$user = $this->getUser();
|
|
|
$validator = \Validator::make($request->all(),
|
|
|
[
|
|
|
- 'data.bank_id' => 'required',
|
|
|
+ 'data.bank_id' => 'required|integer',
|
|
|
'data.cash' => 'required',
|
|
|
],
|
|
|
[
|
|
|
'data.id.required' => '请选择提现账号',
|
|
|
+ 'data.id.integer' => '提现账号不存在',
|
|
|
'data.cash.required' => '请输入金额',
|
|
|
]
|
|
|
);
|
| xqd
@@ -515,44 +516,47 @@ class MyController extends Controller
|
|
|
* }
|
|
|
*}
|
|
|
* keyword存在
|
|
|
- {
|
|
|
- "status": true,
|
|
|
- "status_code": 0,
|
|
|
- "message": "",
|
|
|
- "data": [
|
|
|
- {
|
|
|
- "id": 2,
|
|
|
- "user_id": 1,
|
|
|
- "dream_id": 12,
|
|
|
- "dream_user_id": 2,
|
|
|
- "interaction_number": 0,
|
|
|
- "created_at": "2017-06-25 13:11:45",
|
|
|
- "updated_at": "2017-06-25 13:11:45",
|
|
|
- "dreams": [ 梦想
|
|
|
- {
|
|
|
- "id": 12,
|
|
|
- "user_id": 2,
|
|
|
- "name": "用户2梦想标题166",
|
|
|
- "about": "用户2梦想介绍666",
|
|
|
- "coin": 2500,
|
|
|
- "end_time": 72000,
|
|
|
- "get_coin": 792,
|
|
|
- "mark": 5484,
|
|
|
- "status": 0,
|
|
|
- "video": "e",
|
|
|
- "score": 158730,
|
|
|
- "sign": "梦想达人",
|
|
|
- "created_at": "2017-06-25 13:10:56",
|
|
|
- "updated_at": "2017-06-28 16:53:39"
|
|
|
- "img": { 图片
|
|
|
- "title": "",
|
|
|
- "pic": "https://timgsa.baidu.com/timg9&di2f.jpg"
|
|
|
- }
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
+ *{
|
|
|
+ * "status": true,
|
|
|
+ * "status_code": 0,
|
|
|
+ * "message": "",
|
|
|
+ * "data": [
|
|
|
+ * {
|
|
|
+ * "id": 2,
|
|
|
+ * "user_id": 1,
|
|
|
+ * "dream_id": 12,
|
|
|
+ * "dream_user_id": 2,
|
|
|
+ * "interaction_number": 0,
|
|
|
+ * "created_at": "2017-06-25 13:11:45",
|
|
|
+ * "updated_at": "2017-06-25 13:11:45",
|
|
|
+ * "dreams": [ 梦想
|
|
|
+ * {
|
|
|
+ * "id": 12,
|
|
|
+ * "user_id": 2,
|
|
|
+ * "name": "用户2梦想标题166",
|
|
|
+ * "about": "用户2梦想介绍666",
|
|
|
+ * "coin": 2500,
|
|
|
+ * "end_time": 72000,
|
|
|
+ * "get_coin": 792,
|
|
|
+ * "mark": 5484,
|
|
|
+ * "status": 0,
|
|
|
+ * "video": "e",
|
|
|
+ * "score": 158730,
|
|
|
+ * "sign": "梦想达人",
|
|
|
+ * "created_at": "2017-06-25 13:10:56",
|
|
|
+ * "updated_at": "2017-06-28 16:53:39"
|
|
|
+ * "img": { 图片
|
|
|
+ * "title": "",
|
|
|
+ * "pic": "https://timgsa.baidu.com/timg9&di2f.jpg"
|
|
|
+ * },
|
|
|
+ * "user": {
|
|
|
+ *
|
|
|
+ * }
|
|
|
+ * }
|
|
|
+ * ]
|
|
|
+ * }
|
|
|
+ * ]
|
|
|
+ *}
|
|
|
* @apiErrorExample {json} Error-Response:
|
|
|
* HTTP/1.1 400 Bad Request
|
|
|
*/
|
| xqd
@@ -574,18 +578,19 @@ class MyController extends Controller
|
|
|
return $this->api($data);
|
|
|
}else{
|
|
|
$dreams = $user->collection;
|
|
|
- $users = [];
|
|
|
+// $users = [];
|
|
|
foreach ($dreams as $item) {
|
|
|
- if ($item->pivot->interaction_number > 0) {
|
|
|
+ /* if ($item->pivot->interaction_number > 0) {
|
|
|
$user_info = UserInfoModel::find($item->pivot->dream_user_id);
|
|
|
$avatar = $user_info ? $user_info->avatar : '';
|
|
|
if (!array_key_exists($item->pivot->dream_user_id,$users)) {
|
|
|
$users[$item->pivot->dream_user_id] = $avatar;
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
$item->img;
|
|
|
+ $item->user;
|
|
|
}
|
|
|
- return $this->api(compact('dreams','users'));
|
|
|
+ return $this->api(compact('dreams'));
|
|
|
}
|
|
|
}
|
|
|
|