Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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;
     }
 }

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;
     	}
     }