|
@@ -161,7 +161,6 @@ class Active extends Api
|
|
$data['gift_id'] = $gift_id;
|
|
$data['gift_id'] = $gift_id;
|
|
|
|
|
|
$data['name'] = $result['name'];
|
|
$data['name'] = $result['name'];
|
|
- $data['status'] = 0;
|
|
|
|
$data['remark'] = $remark;
|
|
$data['remark'] = $remark;
|
|
$data['createtime'] = $time;
|
|
$data['createtime'] = $time;
|
|
$log_id = Db::name('actives_user_log')->insertGetId($data);
|
|
$log_id = Db::name('actives_user_log')->insertGetId($data);
|
|
@@ -247,13 +246,13 @@ class Active extends Api
|
|
}
|
|
}
|
|
|
|
|
|
$log = Db::name('actives_user_log log')
|
|
$log = Db::name('actives_user_log log')
|
|
- ->field('log.user_id,log.active_id,log.name,log.status,log.createtime,user.nickname,user.mobile,user.avatar')
|
|
|
|
|
|
+ ->field('log.user_id,log.name,log.remark,log.createtime,user.nickname,user.avatar')
|
|
->join('user','user.id = log.user_id','LEFT')
|
|
->join('user','user.id = log.user_id','LEFT')
|
|
->where($where)->order('log.id desc')->autopage()->select();
|
|
->where($where)->order('log.id desc')->autopage()->select();
|
|
|
|
|
|
foreach($log as $key => &$val){
|
|
foreach($log as $key => &$val){
|
|
$val['avatar'] = cdnurl($val['avatar']);
|
|
$val['avatar'] = cdnurl($val['avatar']);
|
|
- $val['mobile'] = str_replace(substr($val['mobile'],3,5),'****',$val['mobile']);
|
|
|
|
|
|
+// $val['mobile'] = str_replace(substr($val['mobile'],3,5),'****',$val['mobile']);
|
|
}
|
|
}
|
|
return $this->success('success',$log);
|
|
return $this->success('success',$log);
|
|
}
|
|
}
|