Merge branch 'test'

application/api_broker/controller/Broker.php

@@ -144,7 +144,7 @@ class Broker extends Basic
         if ($params["phone"] != "13918937742") {
             $is_login = $this->brokerService->judgeBand($params["device_id"], $agents_data['id'], $params["model"], 0, $params["push_id"], 0);
             if (!$is_login) {
-                return $this->response("102", "该账号没有绑定该手机，请致电人事进行绑定。");
+                return $this->response("102", "该账号没有绑定该手机，请致电财务进行绑定。");
             }
         }
 

application/index/controller/Login.php

@@ -84,7 +84,7 @@ class Login extends Basic
                 //判断设备id是否存在
                 $is_login = $this->brokerService->judgeBand($only_id, $user_data['id'], $model, 0, $user_data['phone'], 1);
                 if (!$is_login) {
-                    return $this->response("102", "该账号没有绑定该设备，请致电人事进行绑定。");
+                    return $this->response("102", "该账号没有绑定该设备，请致电财务进行绑定。");
                 }
             }
 

public/resource/js/user.js

@@ -596,6 +596,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				success: function(data) {
 					if(data.code == 200) {
 						console.log(666);
+					}else{
+						alert(data.msg)
 					}
 				}
 			});