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
1e774b1f
Commit
1e774b1f
authored
Aug 20, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
787af999
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
Remark.php
application/index/controller/Remark.php
+2
-2
UPhoneFollowPp.php
application/model/UPhoneFollowPp.php
+2
-1
No files found.
application/index/controller/Remark.php
View file @
1e774b1f
...
...
@@ -128,14 +128,14 @@ class Remark extends Basic
$data
[
'data'
][
'list'
]
=
$u_phone_follow
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'id desc'
,
$field
,
$where
);
foreach
(
$data
[
'data'
][
'list'
]
as
$k
=>
$v
)
{
//
dump($v);
//
dump($v);
//判断客户是否超过24小时保护期间 0:保护器内 1:超过保护期
/*$ser = new UserExpiredTimeService();
$res = $ser->getExpiredTimeByUser($v["user_id"]);
$data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/
$is_outstrip_twenty_four_hours
=
0
;
if
((
time
()
-
strtotime
(
$v
[
'create_time'
]))
>
(
60
*
60
*
24
)){
if
((
time
()
-
strtotime
(
$v
[
'
u_
create_time'
]))
>
(
60
*
60
*
24
)){
$is_outstrip_twenty_four_hours
=
1
;
}
$data
[
'data'
][
'list'
][
$k
][
'is_outstrip_twenty_four_hours'
]
=
$is_outstrip_twenty_four_hours
;
...
...
application/model/UPhoneFollowPp.php
View file @
1e774b1f
...
...
@@ -280,9 +280,10 @@ class UPhoneFollowPp extends BaseModel
}
if
(
!
empty
(
$v
[
'user_id'
]))
{
$user_data
=
$m_user
->
getUserById
(
'user_name,user_phone,vip,agent_id'
,
$v
[
'user_id'
]);
$user_data
=
$m_user
->
getUserById
(
'user_name,user_phone,vip,agent_id
,create_time
'
,
$v
[
'user_id'
]);
$data
[
$k
][
'user_name'
]
=
$user_data
[
'user_name'
];
$data
[
$k
][
'user_phone'
]
=
$user_data
[
'user_phone'
];
$data
[
$k
][
'u_create_time'
]
=
$user_data
[
'create_time'
];
$data
[
$k
][
'vip'
]
=
$user_data
[
'vip'
];
$data
[
$k
][
'agent_id'
]
=
$user_data
[
'agent_id'
];
//客户客方
}
...
...
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