Merge branch 'test'

application/api/controller/Broker.php

@@ -235,6 +235,6 @@ class Broker extends Basic{
        $push =  new PushMessageService();
 //       $push->pushReportMessage(2362,3670,1);
 //        $push->pushMarchInMessage(26964);
-        $push->pushBargainCommissionMessage('小杨-业务员',3, 15539);
+        $push->pushBargainMessage(26989);
     }
 }

application/api_broker/service/PushMessageService.php

@@ -98,12 +98,15 @@ class PushMessageService
     public function pushBargainMessage($report_id = 0){
         $report  = new OReportModel();
         $feed    = new PushFeed();
-        $field   = 'house_id,house_title,report_agent_name,report_store_id,user_id,report_agent_id';
+        $agent   = new AAgents();
+        $field   = 'house_id,house_title,report_agent_name,user_id,report_agent_id';
 
         $report_data = $report->getReportOrder($field, [ 'a.id' => $report_id ]);
 
+        //查询经纪人门店和部门信息
+        $agent_store = $agent->verifyUser('store_id', '', ['id'=>$report_data['report_agent_id']]);
         $store = new AStore();
-        $store_name = $store->getStoreDistrictName($report_data['report_store_id']);
+        $store_name = $store->getStoreDistrictName($agent_store['store_id']);
         $title   = '成交就是这么简单';
 
         $feed->editData([
@@ -123,6 +126,7 @@ class PushMessageService
         $content = "恭喜【{$store_name}】店【{$report_data['report_agent_name']}】成交【{$report_data['house_title']}】商铺一套";
         $url = $this->push->http_host(). '/app/dist/index.html#/feeds?id='.$feed->id;
         $feed->editData(['link'=>$url], $feed->id);
+
         $this->push->push_message_for_all($title, $content, $url);
 
         return ;

application/index/controller/Agent.php

@@ -125,15 +125,11 @@ class Agent extends Basic
                 return $this->response(101, '门店id为空！');
             }
 
-            $password = $m_agent->verifyUser('password', '', ['phone'=> $this->params['phone']]);
+            $num = 0; //判断重复手机号
 
             //新增或者编辑数据
             if(empty($this->params['id'])) {
-
-                //判断name是否重复
-                if(!empty($password)) {                
-                    return $this->response(101, '手机号重复');
-                }
+                $num = $m_agent->getListDistrictTotal(['phone'=> $this->params['phone']]);
 
                 $data['create_time'] =  date( 'Y-m-d H:i:s',time());
                 $data['update_time'] =  date( 'Y-m-d H:i:s',time());
@@ -141,16 +137,26 @@ class Agent extends Basic
                 $data['password'] = md5(substr($this->params['phone'], -6));  //默认号码后6位
                 $data['auth_group_id'] = 5;
             } else {
+                $agent_data = $m_agent->verifyUser('phone,password', '', ['id'=> $this->params['id']]);
+
+                if ($agent_data['phone'] != $this->params['phone']) {
+                    $num = $m_agent->getListDistrictTotal(['phone'=>$this->params['phone']]);
+                }
+
                 $data['update_time'] = date( 'Y-m-d H:i:s',time());
-                
-                if (!empty($this->params['password'])) {
+
+                if (!empty($this->params['password']) && !empty($agent_data['password'])) {
                     $md5_password = md5($this->params['password']);
-                    if (($md5_password != $password['password']) && ($password['password'] != $this->params['password'])) {
+                    if (($md5_password != $agent_data['password']) && ($agent_data['password'] != $this->params['password'])) {
                         $data['password'] = $md5_password;
                     }
                 }
             }
 
+            if($num > 0) {
+                return $this->response(101, '手机号重复');
+            }
+
             $store = new AStore();
             $data['district_id'] = $store->getStoreKeyById('district_id', ['id'=>$this->params['store_id']]);
             

public/resource/js/agent.js

@@ -30,6 +30,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
                 $(".form-horizontal")[0].reset();               //重置表单
                 agent.agent_id = $(this).attr("data-id");
                 $("#password").parent().removeClass('hide');  //编辑显示密码
+                $("#password").attr('type','text');
                 agent.Edit();
             });