Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
09b4fc6f
Commit
09b4fc6f
authored
Oct 22, 2018
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
跟进区分城市
parent
3ff59a53
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
Basic.php
application/api_broker/extend/Basic.php
+0
-2
Member.php
application/index/controller/Member.php
+1
-1
Basic.php
application/index/extend/Basic.php
+9
-8
Users.php
application/model/Users.php
+2
-2
No files found.
application/api_broker/extend/Basic.php
View file @
09b4fc6f
...
...
@@ -134,8 +134,6 @@ class Basic extends Controller
echo
json_encode
(
array
(
"code"
=>
"300"
,
"msg"
=>
$exception
,
"data"
=>
[],
"type"
=>
"json"
));
exit
;
}
}
/**
...
...
application/index/controller/Member.php
View file @
09b4fc6f
...
...
@@ -307,7 +307,7 @@ class Member extends Basic{
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'
;
try
{
$data_list
=
$this
->
user
->
getUserAgent
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
,
$type
);
$data_list
=
$this
->
user
->
getUserAgent
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
,
$type
,
$this
->
siteId
);
$clientService
=
new
ClientService
();
$list
=
[];
foreach
(
$data_list
as
$k
=>
$v
)
{
...
...
application/index/extend/Basic.php
View file @
09b4fc6f
...
...
@@ -38,6 +38,7 @@ class Basic extends Controller
public
$lastLoginTime
;
public
$city
;
public
$siteId
;
protected
$filterVerify
=
array
(
'index/login'
,
...
...
@@ -289,7 +290,6 @@ class Basic extends Controller
$result
=
$records
->
record
(
$agents_id
,
$type
,
$remark
,
''
,
$user_id
);
return
$result
;
}
/**
* 默认城市选择
* @param $agentId
...
...
@@ -299,15 +299,17 @@ class Basic extends Controller
try
{
$redis_
=
RedisExt
::
getRedis
();
if
(
$redis_
)
{
$city
=
$redis_
->
get
(
"agent_city_"
.
$agentId
);
$this
->
city
=
empty
(
$city
)
?
"上海市"
:
$city
;
}
else
{
$this
->
city
=
$redis_
->
get
(
"agent_city_"
.
$agentId
);
$this
->
siteId
=
$redis_
->
get
(
"agent_site_id_"
.
$agentId
);
}
if
(
empty
(
$this
->
city
)
||
empty
(
$this
->
siteId
)){
//取数据库
$this
->
city
=
"上海市"
;
$this
->
siteId
=
"10001"
;
}
}
catch
(
Exception
$exception
)
{
$this
->
city
=
"上海市"
;
echo
json_encode
(
array
(
"code"
=>
"300"
,
"msg"
=>
$exception
,
"data"
=>
[],
"type"
=>
"json"
));
exit
;
}
}
}
\ No newline at end of file
application/model/Users.php
View file @
09b4fc6f
...
...
@@ -112,7 +112,7 @@ class Users extends Model
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getUserAgent
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'a.id desc'
,
$fields
=
'*'
,
$params
=
''
,
$type
=
0
)
public
function
getUserAgent
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'a.id desc'
,
$fields
=
'*'
,
$params
=
''
,
$type
=
0
,
$site_id
)
{
$data
=
[];
...
...
@@ -162,7 +162,7 @@ class Users extends Model
->
select
();
}
//echo Db::table($this->table)->getLastSql();
$user_follow
=
new
UPhoneFollowPp
();
$user_follow
=
new
UPhoneFollowPp
(
$site_id
);
foreach
(
$result
as
$k
=>
$v
)
{
$data
[
$k
]
=
$v
->
getData
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment