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
4830f68d
Commit
4830f68d
authored
Jul 11, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user_nick to user_name
parent
98718b4e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
Remark.php
application/index/controller/Remark.php
+1
-1
remark_follow_template_tpl.html
public/resource/template/remark_follow_template_tpl.html
+5
-1
No files found.
application/index/controller/Remark.php
View file @
4830f68d
...
@@ -85,7 +85,7 @@ class Remark extends Basic
...
@@ -85,7 +85,7 @@ class Remark extends Basic
$where
[
'b.district_id'
]
=
$this
->
params
[
'remark_district_id'
];
$where
[
'b.district_id'
]
=
$this
->
params
[
'remark_district_id'
];
}
}
$field
=
'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_n
ick
,c.user_phone,a.user_status'
;
$field
=
'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_n
ame
,c.user_phone,a.user_status'
;
$data
[
'data'
][
'list'
]
=
$u_phone_follow
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'data'
][
'list'
]
=
$u_phone_follow
->
getFollowList
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'data'
][
'total'
]
=
$u_phone_follow
->
getFollowTotal
(
$where
);
$data
[
'data'
][
'total'
]
=
$u_phone_follow
->
getFollowTotal
(
$where
);
return
$this
->
response
(
200
,
'成功'
,
$data
);
return
$this
->
response
(
200
,
'成功'
,
$data
);
...
...
public/resource/template/remark_follow_template_tpl.html
View file @
4830f68d
...
@@ -18,7 +18,11 @@
...
@@ -18,7 +18,11 @@
[
%=
it
[
item
][
'content'
]
%
]
[
%=
it
[
item
][
'content'
]
%
]
<
/td
>
<
/td
>
<
td
>
[
%=
it
[
item
][
'admin'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'admin'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'user_nick'
]
%
]
<
/td
>
<
td
>
[
%
if
(
it
[
item
][
'user_name'
])
{
%
]
[
%=
it
[
item
][
'user_name'
]
%
]
[
%
}
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'user_phone'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'user_phone'
]
%
]
<
/td
>
<
td
>
<
td
>
<
a
class
=
"btn1 btn-success caozuo"
href
=
"#modal-record"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详细信息
<
/a
>
<
a
class
=
"btn1 btn-success caozuo"
href
=
"#modal-record"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详细信息
<
/a
>
...
...
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