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
822f5427
Commit
822f5427
authored
Apr 25, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户列表修改
parent
b92e6102
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
Member.php
application/index/controller/Member.php
+1
-1
Users.php
application/model/Users.php
+1
-0
edit.js
public/resource/js/edit.js
+1
-1
No files found.
application/index/controller/Member.php
View file @
822f5427
...
...
@@ -177,7 +177,7 @@ class Member extends Basic{
$type
=
3
;
}
$fields
=
'a.id,a.user_nick,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status'
;
$fields
=
'a.id,a.user_nick,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status
,b.create_time as follow_time
'
;
$data
[
'list'
]
=
$this
->
user
->
getUserAgent
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
,
$type
);
$data
[
'total'
]
=
$this
->
user
->
getUserAgentTotal
(
$where
,
$type
);
$return
=
$this
->
response
(
$data
[
'status'
],
$data
[
'msg'
],
$data
);
...
...
application/model/Users.php
View file @
822f5427
...
...
@@ -96,6 +96,7 @@ class Users extends Model
->
select
();
}
else
{
$result
=
$this
->
field
(
$fields
)
->
alias
(
'a'
)
->
join
(
'u_phone_follow_up b'
,
'a.id = b.user_id'
,
'left'
)
->
where
(
$params
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
...
...
public/resource/js/edit.js
View file @
822f5427
...
...
@@ -987,7 +987,7 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
if
(
typeof
data
===
'object'
)
{
if
(
data
.
code
==
200
)
{
alert
(
'添加成功!'
);
location
.
replace
(
'/admin.php/index/
h
ouseList.html'
);
location
.
replace
(
'/admin.php/index/
getH
ouseList.html'
);
}
else
{
alert
(
data
[
'msg'
]);
};
...
...
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