|
@@ -119,6 +119,7 @@ class Active extends Api |
|
@@ -119,6 +119,7 @@ class Active extends Api |
|
119
|
"apply_endtime"://报名结束时间
|
119
|
"apply_endtime"://报名结束时间
|
|
120
|
"applytime"://报名时间
|
120
|
"applytime"://报名时间
|
|
121
|
"desc"://活动简介
|
121
|
"desc"://活动简介
|
|
|
|
122
|
+ "is_bao":是否报过名(1已经报过名2未报过)
|
|
122
|
}
|
123
|
}
|
|
123
|
})
|
124
|
})
|
|
124
|
*/
|
125
|
*/
|
|
@@ -137,7 +138,12 @@ class Active extends Api |
|
@@ -137,7 +138,12 @@ class Active extends Api |
|
137
|
foreach ($data['image'] as &$val){
|
138
|
foreach ($data['image'] as &$val){
|
|
138
|
$val = 'http://q2ugvq3qf.bkt.clouddn.com'.$val;
|
139
|
$val = 'http://q2ugvq3qf.bkt.clouddn.com'.$val;
|
|
139
|
}
|
140
|
}
|
|
140
|
-
|
141
|
+ $res = Db::name('apply')->where('user_id',$user_id)->where('addactive_id',$id)->find();
|
|
|
|
142
|
+ if(!empty($res)){
|
|
|
|
143
|
+ $data['is_bao'] = 1;
|
|
|
|
144
|
+ }else{
|
|
|
|
145
|
+ $data['is_bao'] = 2;
|
|
|
|
146
|
+ }
|
|
141
|
//编辑返回的时间
|
147
|
//编辑返回的时间
|
|
142
|
$data['kaishitime'] = date('Y-m-d',$data['starttime']);
|
148
|
$data['kaishitime'] = date('Y-m-d',$data['starttime']);
|
|
143
|
$data['jieshutime'] = date('Y-m-d',$data['endtime']);
|
149
|
$data['jieshutime'] = date('Y-m-d',$data['endtime']);
|
