Skip to content

T
tl_estate
Commit 9b8aa3bc authored by clone's avatar clone
Browse files
Options

Merge branch 'test-0806-bug' of https://gitee.com/zwyjjc/tl_estate into test-0806-bug

parents 10c9bbc5 df536a09
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 50 deletions
application/api_broker/controller/Client.php
View file @ 9b8aa3bc
...@@ -62,17 +62,19 @@ class Client extends Basic ...@@ -62,17 +62,19 @@ class Client extends Basic
//编辑 //编辑
$data['start'] = $this->user->edit($this->params, $this->params['id']); $data['start'] = $this->user->edit($this->params, $this->params['id']);
//是否修改客方 if (!empty($this->params['agents_id'])) {
if ($this->params['agents_id'] != $user_agent_id['agent_id']) { //是否修改客方
$agent = new AAgents(); if ($this->params['agents_id'] != $user_agent_id['agent_id']) {
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']); $agent = new AAgents();
$remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone']; $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
$push = new PushMessageService();
$ccr_agent_data = $agent->getAgentInfo('name,phone', $this->params['ccr_id']); $push = new PushMessageService();
$content = "【{$ccr_agent_data['name']}-{$ccr_agent_data['phone']}修改了{$user_agent_id['user_name']}(id:{$user_agent_id['id']})客方】"; $ccr_agent_data = $agent->getAgentInfo('name,phone', $this->params['ccr_id']);
$push->pushMessageById($user_agent_id['agent_id'], '客方修改', $content, 'user_info', $user_agent_id['id']); $content = "【{$ccr_agent_data['name']}-{$ccr_agent_data['phone']}修改了{$user_agent_id['user_name']}(id:{$user_agent_id['id']})客方】";
$this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']); $push->pushMessageById($user_agent_id['agent_id'], '客方修改', $content, 'user_info', $user_agent_id['id']);
$this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']);
}
} }
} else { } else {
$table = new AAgents(); $table = new AAgents();
...@@ -80,7 +82,7 @@ class Client extends Basic ...@@ -80,7 +82,7 @@ class Client extends Basic
//添加 //添加
$data['start'] = $this->user->edit($this->params); $data['start'] = $this->user->edit($this->params);
if ($data['start'] > 0) { if ($data['start'] > 0 && !empty($this->params['agents_id'])) {
$data['id']= $this->user->id; $data['id']= $this->user->id;
$agent_data = $table->getAgentInfo('name,phone',$this->params['agents_id']); $agent_data = $table->getAgentInfo('name,phone',$this->params['agents_id']);
$remark = '新增为'. $agent_data['name'].'-'.$agent_data['phone']; $remark = '新增为'. $agent_data['name'].'-'.$agent_data['phone'];
......
application/index/controller/Member.php
View file @ 9b8aa3bc
...@@ -362,20 +362,25 @@ class Member extends Basic{ ...@@ -362,20 +362,25 @@ class Member extends Basic{
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']); $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '新增为' . $agent_data['name'] . '-' . $agent_data['phone']; $remark = '新增为' . $agent_data['name'] . '-' . $agent_data['phone'];
$result = $this->user->edit($this->params, $this->params['id']); //新增或编辑 $result = $this->user->edit($this->params, $this->params['id']); //新增或编辑
$this->operating_records($this->userId, $type=3, $remark, $this->params['id']); //记录日志
} else { } else {
$user_data = $this->user->getUserById('id,agent_id', $this->params['id']); $user_data = $this->user->getUserById('id,agent_id', $this->params['id']);
if (empty($user_data)) { if (empty($user_data)) {
return $this->response(101, '没有用户信息'); return $this->response(101, '没有用户信息');
} else { } else {
//是否修改客方
if ($this->params['agents_id'] != $user_data['agent_id']) { if (!empty($this->params['agents_id'])) {
$agent = new AAgents(); //是否修改客方
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']); if ($this->params['agents_id'] != $user_data['agent_id']) {
$remark = '修改为' . $agent_data['name'] . '-' . $agent_data['phone']; $agent = new AAgents();
} else { $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '用户编辑'; $remark = '修改为' . $agent_data['name'] . '-' . $agent_data['phone'];
} else {
$remark = '用户编辑';
}
$result = $this->user->edit($this->params, $this->params['id']); //新增或编辑
$this->operating_records($this->userId, $type=3, $remark, $this->params['id']); //记录日志
} }
$result = $this->user->edit($this->params, $this->params['id']); //新增或编辑
} }
} }
...@@ -390,8 +395,6 @@ class Member extends Basic{ ...@@ -390,8 +395,6 @@ class Member extends Basic{
$this->code = 101; $this->code = 101;
$this->msg = '没有新增VIP权限';break; $this->msg = '没有新增VIP权限';break;
} }
$this->operating_records($this->userId, $type=3, $remark, $this->params['id']);
} else { } else {
//编辑获取用户信息 //编辑获取用户信息
......
public/resource/js/myCollectionUserList.js
View file @ 9b8aa3bc
This diff is collapsed.
public/resource/js/user.js
View file @ 9b8aa3bc
...@@ -77,7 +77,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -77,7 +77,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
if(!confirm('是否继续？')) { if(!confirm('是否继续？')) {
return; return;
} }
// agent.id = $(this).attr("data-id"); user.id = $(this).attr("data-id");
var params = { var params = {
}; };
...@@ -94,12 +94,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart', ...@@ -94,12 +94,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
} else { } else {
params.type = 2; params.type = 2;
} }
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$.ajax({ //禁用 $.ajax({ //禁用
'type': 'POST', 'type': 'POST',
'url': '/broker/addCollectUser',//客户收藏 取消收藏 'url': '/broker/addCollectUser',//客户收藏 取消收藏
data: { data: {
// "ids": agent.id, "agents_id": user_info_obj.id,
"status": params.type "status": params.type,
"user_id": user.id,
"AuthToken": user_info_obj.AuthToken
}, },
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
......
public/resource/template/my_collection_user_template_tpl.html
View file @ 9b8aa3bc
...@@ -2,17 +2,7 @@ ...@@ -2,17 +2,7 @@
[% if(it) { %] [% if(it) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<!--<th class="text-center">客户ID</th>
<th class="text-center">客户姓名</th>
<th class="text-center">客户电话</th>
<th class="text-center">创建时间0</th>
<th class="text-center">最后跟进时间0</th>
<th class="text-center">客户状态</th>
<th class="text-center">业态</th>
<th class="text-center">价格</th>
<th class="text-center">面积</th>
<th class="text-center">产生类型0</th>
<th class="text-center">操作</th>-->
<td>[%= it[item]["user_id"] %]</td> <td>[%= it[item]["user_id"] %]</td>
<td>[%= it[item]["user_name"] %]</td> <td>[%= it[item]["user_name"] %]</td>
<td>[%= it[item]["user_phone"] %]</td> <td>[%= it[item]["user_phone"] %]</td>
...@@ -20,9 +10,19 @@ ...@@ -20,9 +10,19 @@
<td>[%= it[item]["industry_type"] %]</td> <td>[%= it[item]["industry_type"] %]</td>
<td>[%= it[item]["price_demand"] %]</td> <td>[%= it[item]["price_demand"] %]</td>
<td>[%= it[item]["area_demand"] %]</td> <td>[%= it[item]["area_demand"] %]</td>
<td> <td width="16%">
<a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a> [% if((check_auth('auth_vip') && it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %]
</td>
<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
<a class="btn1 btn-info is_show" data-id='[%= it[item]["user_id"] %]'>收藏</a>
<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]'>客户编辑</a>&nbsp;
[% } %]
<!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>-->
<!--删除-->
<!--</a>-->
</td>
</tr> </tr>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
......
public/resource/template/user_template_tpl.html
View file @ 9b8aa3bc
...@@ -46,20 +46,9 @@ ...@@ -46,20 +46,9 @@
[% if((check_auth('auth_vip') && it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %] [% if((check_auth('auth_vip') && it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %]
<a class="btn1 caozuo genj_ure caozuo-add-color [%= getLoaclId(it[item]['id']) %]" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp; <a class="btn1 caozuo genj_ure caozuo-add-color [%= getLoaclId(it[item]['id']) %]" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a>&nbsp;
<!--[% if(it[item]["status"] == 0) { %]-->
<a class="btn1 btn-info is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a> <a class="btn1 btn-info is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a>
<!--[% }else if(it[item]["status"] == 1) { %]-->
<!--<a class="btn1 btn-default is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>冻结</a>
[% }else{ %]
<a class="btn1 btn-default" data-toggle="modal" data-id='[%= it[item]["id"] %]'>离职</a>
[% } %]-->
<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp; <a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
<!--<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;-->
<!--<a class="btn1 btn-success take-look" href="#modal-takeLook" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]' data-phone='[%= it[item]["user_phone"] %]'>约带看</a>-->
[% } %] [% } %]
<!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>--> <!--<a class="btn1 btn-danger " href="#modal-delete" data-toggle="modal" onclick="delete_user(this)" data-id='[%= it[item]["id"] %]'>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment