diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index 40d0da370..ce8cf11ac 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -379,6 +379,9 @@ class PromoteModel extends Model{ { $result = []; $result = $this->field("*")->where("level={$level}")->select(); + foreach ($result as &$item) { + $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : ""); + } return $result; } } \ No newline at end of file diff --git a/Public/Home/js/20170831/common.js b/Public/Home/js/20170831/common.js index 6cbdf3c1e..e737460f8 100644 --- a/Public/Home/js/20170831/common.js +++ b/Public/Home/js/20170831/common.js @@ -186,10 +186,10 @@ $(function(){ window.updateAlert = function (text,status,c) { switch(status){ case 1: - layer.msg(text, {icon: 2}); + layer.msg(text, {icon: 1}); break; default: - layer.msg(text, {icon: 1}); + layer.msg(text, {icon: 2}); break; } }