diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index b3d3a391..d04caafc 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -319,13 +319,13 @@ class BaseController extends RestController{ } else { switch ($result['code']) { case 1021:{ - $this->set_message(1010,"fail","验证码已失效,请重新获取"); + $this->new_set_message(1010,"验证码已失效,请重新获取"); };break; case 1022:{ - $this->set_message(1022,"fail","验证码不正确,请重新输入"); + $this->new_set_message(1022,"验证码不正确,请重新输入"); };break; default: - $this->set_message($result['code'],"fail",$result['msg']); + $this->new_set_message($result['code'],$result['msg']); } } diff --git a/Application/Sdk/Controller/NoticeController.class.php b/Application/Sdk/Controller/NoticeController.class.php index f07cd487..fde269fc 100644 --- a/Application/Sdk/Controller/NoticeController.class.php +++ b/Application/Sdk/Controller/NoticeController.class.php @@ -46,7 +46,7 @@ class NoticeController extends BaseController{ $notice_list = $notice ->field('id as notice_id,title,start_time as create_time,1 as type') ->where($map) - ->order('level desc') + ->order('level desc,create_time desc') ->select(); $notice_read_model = M('notice_read', 'tab_'); $notice_read = M('notice_read', 'tab_')