Commit d181afab authored by liyadong's avatar liyadong

Merge branch 'test' of http://gitlab.cccwangluo.com/zhoujun/uc_card into test

parents 6bfc74da ecd39ed2
......@@ -95,7 +95,7 @@ class AdminController extends Controller
return $query->where('updated_at','<',$endTime);
})->when($status == 0, function ($query) use ($status) {
return $query->orderBy('status','ASC');
})->orderBy('id','ASC')->select('id', 'uid', 'img_url', 'status', 'updated_at')->paginate($pageNum);
})->orderBy('updated_at','DESC')->select('id', 'uid', 'img_url', 'status', 'updated_at')->paginate($pageNum);
if($startTime != '') $paginateAppends['startTime'] = $startTime;
if($endTime != '') $paginateAppends['endTime'] = $endTime;
if($userName != '') $paginateAppends['user'] = $userName;
......@@ -128,7 +128,6 @@ class AdminController extends Controller
if($id < 1 || !in_array($status,[1,2])) return $this->getErrorMsg('10060', '参数错误');
$row = WxUserImg::find($id);
if(!$row) return $this->getErrorMsg('10061', '数据异常');
if($row->status == 1) return $this->getErrorMsg('10062', '请勿重复审核');
$row->status = $status;
if($row->save()) return $this->getSuccessMsg([]);
return $this->getErrorMsg('10063', '审核失败');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment