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
b3054e44
Commit
b3054e44
authored
Feb 28, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test-hujun1.15' of
https://gitee.com/zwyjjc/tl_estate
into test-hujun1.15
parents
d28366a2
f28291c4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
Broker.php
application/api_broker/controller/Broker.php
+2
-1
database.php
application/database.php
+1
-1
navigation.html
application/index/view/global/navigation.html
+0
-4
No files found.
application/api_broker/controller/Broker.php
View file @
b3054e44
...
@@ -217,7 +217,7 @@ class Broker extends Basic
...
@@ -217,7 +217,7 @@ class Broker extends Basic
*/
*/
public
function
useraction_search
()
public
function
useraction_search
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/*$params['user_id'] ='1';
/*$params['user_id'] ='1';
$params['searchdate'] ='跟进内容';*/
$params['searchdate'] ='跟进内容';*/
...
@@ -269,6 +269,7 @@ class Broker extends Basic
...
@@ -269,6 +269,7 @@ class Broker extends Basic
// 查询数据集
// 查询数据集
$user_res
=
$user
$user_res
=
$user
->
where
(
'id'
,
$user_id
)
->
where
(
'id'
,
$user_id
)
->
field
(
'id as user_id,sex,user_nick,user_phone'
)
->
find
();
->
find
();
return
$this
->
response
(
"200"
,
"success!"
,
[
'user_info'
=>
$user_res
,
'user_date'
=>
$UPhoneFollowPp_res
,
'pagenum'
=>
$pagenum
,
'total'
=>
$total
]);
return
$this
->
response
(
"200"
,
"success!"
,
[
'user_info'
=>
$user_res
,
'user_date'
=>
$UPhoneFollowPp_res
,
'pagenum'
=>
$pagenum
,
'total'
=>
$total
]);
}
else
{
}
else
{
...
...
application/database.php
View file @
b3054e44
...
@@ -21,7 +21,7 @@ return [
...
@@ -21,7 +21,7 @@ return [
'username'
=>
'tldc_online'
,
'username'
=>
'tldc_online'
,
// 'username' => 'root',
// 'username' => 'root',
// 密码
// 密码
'password'
=>
'Fujuhaofang123'
,
'password'
=>
'Fujuhaofang123
022818root
'
,
// 'password' => '123456',
// 'password' => '123456',
// 端口
// 端口
'hostport'
=>
'3308'
,
'hostport'
=>
'3308'
,
...
...
application/index/view/global/navigation.html
View file @
b3054e44
...
@@ -64,10 +64,6 @@
...
@@ -64,10 +64,6 @@
<li
role=
"presentation"
>
<li
role=
"presentation"
>
<a
href=
"/admin.php/index/BusinessDistrict.html"
>
商圈列表
</a>
<a
href=
"/admin.php/index/BusinessDistrict.html"
>
商圈列表
</a>
</li>
</li>
<li
role=
"presentation"
>
<a
href=
"/admin.php/index/editBusinessDistrict.html"
>
编辑商圈
</a>
</li>
</ul>
</ul>
</nav>
</nav>
...
...
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