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
f1028ad5
Commit
f1028ad5
authored
Feb 05, 2018
by
clone
Committed by
hujun
Mar 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
格式
parent
fce1666d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
Shop.php
application/api/controller/Shop.php
+5
-5
No files found.
application/api/controller/Shop.php
View file @
f1028ad5
...
@@ -93,14 +93,14 @@ class Shop extends Basic
...
@@ -93,14 +93,14 @@ class Shop extends Basic
//面积 room_area最小面积 room_area2最大面积 参考老版本
//面积 room_area最小面积 room_area2最大面积 参考老版本
//面积 room_area最小面积 room_area2最大面积 参考老版本
//面积 room_area最小面积 room_area2最大面积 参考老版本
if
(
isset
(
$params
[
'area_start'
])
&&
isset
(
$params
[
'area_end'
]))
{
if
(
isset
(
$params
[
'area_start'
])
&&
isset
(
$params
[
'area_end'
]))
{
$conditions
[
'a.room_area'
]
=
array
(
'between'
,
array
(
$params
[
'area_start'
],
$params
[
'area_end'
]
)
);
$conditions
[
'a.room_area'
]
=
array
(
'between'
,
array
(
$params
[
'area_start'
],
$params
[
'area_end'
]
)
);
//街铺只有一个room_area
//街铺只有一个room_area
if
(
$params
[
'shangpu_type'
]
==
0
)
{
if
(
$params
[
'shangpu_type'
]
==
0
)
{
$conditions
[
'a.room_area2'
]
=
array
(
'between'
,
array
(
$params
[
'area_start'
],
$params
[
'area_end'
]
)
);
$conditions
[
'a.room_area2'
]
=
array
(
'between'
,
array
(
$params
[
'area_start'
],
$params
[
'area_end'
]
)
);
}
}
}
else
if
(
isset
(
$params
[
'area_start'
])
&&
!
isset
(
$params
[
'area_end'
]))
{
//100米以上不用传结束面积
}
else
if
(
isset
(
$params
[
'area_start'
])
&&
!
isset
(
$params
[
'area_end'
]))
{
//100米以上不用传结束面积
$conditions
[
'a.room_area'
]
=
array
(
'egt'
,
$params
[
'area_start'
]
);
$conditions
[
'a.room_area'
]
=
array
(
'egt'
,
$params
[
'area_start'
]
);
if
(
$params
[
'shangpu_type'
]
==
0
)
{
if
(
$params
[
'shangpu_type'
]
==
0
)
{
$conditions
[
'a.room_area2'
]
=
array
(
'egt'
,
$params
[
'area_start'
]
);
$conditions
[
'a.room_area2'
]
=
array
(
'egt'
,
$params
[
'area_start'
]
);
}
}
}
}
...
@@ -178,7 +178,7 @@ class Shop extends Basic
...
@@ -178,7 +178,7 @@ class Shop extends Basic
$result
[
"api_path"
]
=
IMG_PATH
;
$result
[
"api_path"
]
=
IMG_PATH
;
$param
[
"house_id"
]
=
$params
[
'id'
];
$param
[
"house_id"
]
=
$params
[
'id'
];
//todo 这里的是否要更改成b端后台上传的类型
//todo 这里的是否要更改成b端后台上传的类型
$param
[
"imgtype"
]
=
2
;
$param
[
"imgtype"
]
=
2
;
$result
[
"images"
]
=
$this
->
dbImg
->
getHouseImages
(
$param
,
15
);
$result
[
"images"
]
=
$this
->
dbImg
->
getHouseImages
(
$param
,
15
);
$param
[
"imgtype"
]
=
4
;
//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图
$param
[
"imgtype"
]
=
4
;
//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图
$result
[
"plan_images"
]
=
$this
->
dbImg
->
getHouseImages
(
$param
,
4
);
$result
[
"plan_images"
]
=
$this
->
dbImg
->
getHouseImages
(
$param
,
4
);
...
...
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