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
34737b0f
Commit
34737b0f
authored
Oct 22, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
所属城市-商铺跟进-客户跟进-商铺列表-客户列表
parent
d9aed50d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
14 deletions
+26
-14
HomePageLog.php
application/api_broker/controller/HomePageLog.php
+8
-4
Houses.php
application/index/controller/Houses.php
+5
-1
Member.php
application/index/controller/Member.php
+4
-4
Remark.php
application/index/controller/Remark.php
+9
-5
No files found.
application/api_broker/controller/HomePageLog.php
View file @
34737b0f
...
@@ -167,10 +167,14 @@ class HomePageLog extends Basic
...
@@ -167,10 +167,14 @@ class HomePageLog extends Basic
$where_
[
"f.create_time"
]
=
array
(
'between'
,
array
(
$start_time
,
$end_time
)
);
$where_
[
"f.create_time"
]
=
array
(
'between'
,
array
(
$start_time
,
$end_time
)
);
}
}
if
(
empty
(
$params
[
'city'
]))
{
// if (empty($params['city'])) {
$where_
[
"f.city"
]
=
trim
(
$this
->
city
)
?
trim
(
$this
->
city
)
:
'上海市'
;
// $where_["f.city"] = trim($this->city) ? trim($this->city) : '上海市';
}
else
{
// } else {
$where_
[
"f.city"
]
=
$params
[
'city'
]
?
$params
[
'city'
]
:
'上海市'
;
// $where_["f.city"] = $params['city'] ? $params['city'] : '上海市';
// }
if
(
$this
->
city
!=
'全部'
)
{
$where_
[
"f.city"
]
=
$this
->
city
;
}
}
if
(
!
empty
(
$params
[
'disc'
]))
{
if
(
!
empty
(
$params
[
'disc'
]))
{
...
...
application/index/controller/Houses.php
View file @
34737b0f
...
@@ -228,7 +228,11 @@ class Houses extends Basic
...
@@ -228,7 +228,11 @@ class Houses extends Basic
}
}
/*所在城市*/
/*所在城市*/
if
(
!
empty
(
$this
->
params
[
'city'
]))
{
// if (!empty($this->params['city'])) {
// $where['city'] = $this->params['city'];
// }
if
(
$this
->
city
!=
'全部'
)
{
$where
[
'city'
]
=
$this
->
params
[
'city'
];
$where
[
'city'
]
=
$this
->
params
[
'city'
];
}
}
...
...
application/index/controller/Member.php
View file @
34737b0f
...
@@ -258,11 +258,11 @@ class Member extends Basic{
...
@@ -258,11 +258,11 @@ class Member extends Basic{
}
}
}
}
if
(
!
empty
(
$params
[
'province'
]))
{
//
if (!empty($params['province'])) {
$where
[
'a.province'
]
=
$params
[
'province'
];
//
$where['a.province'] = $params['province'];
}
//
}
if
(
!
empty
(
$params
[
'city'
])
)
{
if
(
$this
->
city
!=
'全部'
)
{
$where
[
'a.city'
]
=
$params
[
'city'
];
$where
[
'a.city'
]
=
$params
[
'city'
];
}
}
...
...
application/index/controller/Remark.php
View file @
34737b0f
...
@@ -82,12 +82,16 @@ class Remark extends Basic
...
@@ -82,12 +82,16 @@ class Remark extends Basic
$agent_where
[
'district_id'
]
=
$this
->
params
[
'remark_district_id'
];
$agent_where
[
'district_id'
]
=
$this
->
params
[
'remark_district_id'
];
}
}
if
(
!
empty
(
$this
->
params
[
'province'
]))
{
// if (!empty($this->params['province'])) {
$where
[
'province'
]
=
$this
->
params
[
'province'
];
// $where['province'] = $this->params['province'];
}
// }
// if (!empty($this->params['city'])) {
// $where['city'] = $this->params['city'];
// }
if
(
!
empty
(
$this
->
params
[
'city'
])
)
{
if
(
$this
->
city
!=
'全部'
)
{
$where
[
'city'
]
=
$this
->
params
[
'city'
]
;
$where
[
'city'
]
=
$this
->
city
;
}
}
if
(
!
empty
(
$this
->
params
[
'disc'
]))
{
if
(
!
empty
(
$this
->
params
[
'disc'
]))
{
...
...
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