Commit b3054e44 authored by clone's avatar clone

Merge branch 'test-hujun1.15' of https://gitee.com/zwyjjc/tl_estate into test-hujun1.15

parents d28366a2 f28291c4
......@@ -217,7 +217,7 @@ class Broker extends Basic
*/
public function useraction_search()
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/*$params['user_id'] ='1';
$params['searchdate'] ='跟进内容';*/
......@@ -269,6 +269,7 @@ class Broker extends Basic
// 查询数据集
$user_res =$user
->where('id', $user_id)
->field('id as user_id,sex,user_nick,user_phone')
->find();
return $this->response("200", "success!", ['user_info'=>$user_res,'user_date'=>$UPhoneFollowPp_res,'pagenum'=>$pagenum,'total'=>$total]);
} else {
......
......@@ -21,7 +21,7 @@ return [
'username' => 'tldc_online',
// 'username' => 'root',
// 密码
'password' => 'Fujuhaofang123',
'password' => 'Fujuhaofang123022818root',
// 'password' => '123456',
// 端口
'hostport' => '3308',
......
......@@ -64,10 +64,6 @@
<li role="presentation">
<a href="/admin.php/index/BusinessDistrict.html">商圈列表</a>
</li>
<li role="presentation">
<a href="/admin.php/index/editBusinessDistrict.html">编辑商圈</a>
</li>
</ul>
</nav>
......
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