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
f1bf2189
Commit
f1bf2189
authored
Apr 13, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
9ff09b67
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
AppointmentTime.php
application/api/controller/AppointmentTime.php
+4
-3
AttentionShop.php
application/api/controller/AttentionShop.php
+3
-3
AttentionModel.php
application/model/AttentionModel.php
+0
-1
No files found.
application/api/controller/AppointmentTime.php
View file @
f1bf2189
...
...
@@ -7,6 +7,7 @@ use app\model\Applies;
use
app\model\AppointWatchShop
;
use
app\model\Evaluate
;
use
app\model\GHouses
;
use
app\model\GHousesImgs
;
use
app\model\HouseInfos
;
use
think\helper\Time
;
use
app\model\HouseImgs
;
...
...
@@ -34,7 +35,7 @@ class AppointmentTime extends Basic
$this
->
appointmentTimeModel
=
new
AppointWatchShop
();
//$this->houseInfoModel = new HouseInfos();
$this
->
houseInfoModel
=
new
GHouses
();
$this
->
dbImg
=
new
House
Imgs
();
$this
->
dbImg
=
new
GHouses
Imgs
();
$this
->
appliesModel
=
new
Applies
();
$this
->
evaluateMode
=
new
Evaluate
();
}
...
...
@@ -156,10 +157,10 @@ class AppointmentTime extends Basic
foreach
(
$result
as
$key
=>
$val
)
{
$result
[
$key
][
"api_path"
]
=
IMG_PATH
;
$param
[
"house_id"
]
=
$val
[
"house_id"
];
$param
[
"imgtype"
]
=
1
;
//默认主图
$param
[
"img
_
type"
]
=
1
;
//默认主图
$result
[
$key
][
"images"
]
=
$this
->
dbImg
->
getHouseImages
(
$param
,
1
);
$houseInfo
=
$this
->
houseInfoModel
->
getHouseDetail
s
(
"a.room_num_left,b.foreign_name"
,
array
(
"a.
id"
=>
$val
[
"house_id"
]
));
$houseInfo
=
$this
->
houseInfoModel
->
getHouseDetail
(
"residue_num as room_num_left,external_title as foreign_name"
,
array
(
"
id"
=>
$val
[
"house_id"
]
));
$result
[
$key
][
"room_num_left"
]
=
$houseInfo
[
"room_num_left"
];
$result
[
$key
][
"foreign_name"
]
=
$houseInfo
[
"foreign_name"
];
...
...
application/api/controller/AttentionShop.php
View file @
f1bf2189
...
...
@@ -65,11 +65,11 @@ class AttentionShop extends Basic
public
function
attentionList
()
{
$params
=
$this
->
params
;
/*
$params = array(
"user_id" =>
122
,
$params
=
array
(
"user_id"
=>
816
,
"pageNo"
=>
1
,
"pageSize"
=>
15
,
);
*/
);
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
...
...
application/model/AttentionModel.php
View file @
f1bf2189
...
...
@@ -96,7 +96,6 @@ class AttentionModel extends Model
return
$this
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
'g_houses b'
,
'a.house_id = b.id'
,
'LEFT'
)
->
join
(
'g_houses_imgs c'
,
'c.house_id = b.id'
,
'LEFT'
)
->
where
(
$params
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
...
...
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