|
@@ -169,7 +169,11 @@ class Activity extends Api |
|
@@ -169,7 +169,11 @@ class Activity extends Api |
169
|
$data = db('ronda')
|
169
|
$data = db('ronda')
|
170
|
->where('id', $rid)
|
170
|
->where('id', $rid)
|
171
|
->find();
|
171
|
->find();
|
172
|
- $data['images'] = cdnurl($data['images'], true);
|
172
|
+ $images = explode(',',$data['images']);
|
|
|
173
|
+ foreach ($images as $k){
|
|
|
174
|
+ $list[] = cdnurl($data['images'], true);
|
|
|
175
|
+ }
|
|
|
176
|
+ $data['images'] = $list;
|
173
|
$this->success('获取场次详情成功', $data);
|
177
|
$this->success('获取场次详情成功', $data);
|
174
|
}
|
178
|
}
|
175
|
|
179
|
|
|
@@ -207,11 +211,8 @@ class Activity extends Api |
|
@@ -207,11 +211,8 @@ class Activity extends Api |
207
|
->find();
|
211
|
->find();
|
208
|
$model = new ItemDetails();
|
212
|
$model = new ItemDetails();
|
209
|
$res = db('study')->where('user_id',$user['id'])->find();
|
213
|
$res = db('study')->where('user_id',$user['id'])->find();
|
210
|
- if (empty($res)){
|
|
|
211
|
- $list = $model->where(['item_id'=>$id])->find()->toArray();
|
|
|
212
|
- $data['images'] = $list['images'];
|
|
|
213
|
- }else{
|
|
|
214
|
- $list = $model->where(['item_id'=>$id,'team_id'=>$res['team_id']])->find()->toArray();
|
214
|
+ if (!empty($res)) {
|
|
|
215
|
+ $list = $model->where(['item_id' => $id, 'team_id' => $res['team_id']])->find()->toArray();
|
215
|
$data['images'] = $list['images'];
|
216
|
$data['images'] = $list['images'];
|
216
|
}
|
217
|
}
|
217
|
$data['holdtime'] = date('Y-m-d',$data['holdtime']);
|
218
|
$data['holdtime'] = date('Y-m-d',$data['holdtime']);
|