Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
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
方斌
51business
Commits
3fd7b174
Commit
3fd7b174
authored
Jun 28, 2019
by
李尚科
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
house v2 ordr fix
parent
3b0c4f3b
Pipeline
#9782
passed with stage
in 16 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
new_house.js
app/service/house/v2/new_house.js
+3
-2
rental_house.js
app/service/house/v2/rental_house.js
+1
-1
No files found.
app/service/house/v2/new_house.js
View file @
3fd7b174
...
@@ -338,7 +338,7 @@ class NewHouseService extends Service {
...
@@ -338,7 +338,7 @@ class NewHouseService extends Service {
if
(
type
===
'home'
)
{
if
(
type
===
'home'
)
{
//为您推荐只展示50条在售楼盘的数据,根据排序序号取数,数字小的排在前面,数字一样的情况下根据时间逆序排列,时间也一样的情况下随机排列;
//为您推荐只展示50条在售楼盘的数据,根据排序序号取数,数字小的排在前面,数字一样的情况下根据时间逆序排列,时间也一样的情况下随机排列;
filter
.
limit
=
Number
(
condition
.
page_size
)
||
50
;
filter
.
limit
=
Number
(
condition
.
page_size
)
||
50
;
filter
.
order
.
push
([
'order_id'
,
'asc'
],
[
'created_at'
,
'desc'
]);
// filter.order.push(['order_id', 'desc'], ['created_at', 'desc']);拿掉排序,跟默认排序重复了 2019-6-28 14:06:00 lisk
}
else
if
(
type
===
'all'
)
{
}
else
if
(
type
===
'all'
)
{
filter
.
order
.
push
([
'sale_type'
,
'desc'
]);
filter
.
order
.
push
([
'sale_type'
,
'desc'
]);
}
else
if
(
type
===
'sale'
)
{
}
else
if
(
type
===
'sale'
)
{
...
@@ -405,6 +405,7 @@ class NewHouseService extends Service {
...
@@ -405,6 +405,7 @@ class NewHouseService extends Service {
filter
.
where
.
option_bizicircle_code
=
condition
.
area_code
.
bizcircle_code
;
filter
.
where
.
option_bizicircle_code
=
condition
.
area_code
.
bizcircle_code
;
}
}
}
}
filter
.
order
.
push
([
'order_id'
,
'desc'
],
[
'id'
,
'desc'
]);
//添加默认排序 2019-6-28 14:05:25 lisk
let
newHouseList
=
await
ctx
.
realestateModel
.
NewHouse
.
list
(
filter
);
let
newHouseList
=
await
ctx
.
realestateModel
.
NewHouse
.
list
(
filter
);
let
list
=
[];
let
list
=
[];
if
(
newHouseList
.
count
>
0
)
{
if
(
newHouseList
.
count
>
0
)
{
...
@@ -447,7 +448,7 @@ class NewHouseService extends Service {
...
@@ -447,7 +448,7 @@ class NewHouseService extends Service {
if
(
city_code
)
{
if
(
city_code
)
{
where
.
option_city_code
=
city_code
;
where
.
option_city_code
=
city_code
;
}
}
let
new_houses_rows
=
await
ctx
.
realestateModel
.
NewHouse
.
list
({
page
:
page
,
limit
:
limit
,
where
:
where
,
order
:
[[
'order_id'
,
'
a
sc'
]]
});
let
new_houses_rows
=
await
ctx
.
realestateModel
.
NewHouse
.
list
({
page
:
page
,
limit
:
limit
,
where
:
where
,
order
:
[[
'order_id'
,
'
de
sc'
]]
});
const
similar_list
=
[];
const
similar_list
=
[];
for
(
let
i
in
new_houses_rows
.
rows
)
{
for
(
let
i
in
new_houses_rows
.
rows
)
{
const
new_house
=
new_houses_rows
.
rows
[
i
];
const
new_house
=
new_houses_rows
.
rows
[
i
];
...
...
app/service/house/v2/rental_house.js
View file @
3fd7b174
...
@@ -59,7 +59,7 @@ class RentalHouseService extends Service {
...
@@ -59,7 +59,7 @@ class RentalHouseService extends Service {
where
.
id
=
{
$in
:
match_ids
};
where
.
id
=
{
$in
:
match_ids
};
}
}
const
rental_houses_results
=
await
ctx
.
realestateModel
.
RentalHouse
.
list
({
page
:
page
,
limit
:
Number
(
limit
),
where
:
where
,
order
:
[[
'order_id'
,
'
a
sc'
]]
});
const
rental_houses_results
=
await
ctx
.
realestateModel
.
RentalHouse
.
list
({
page
:
page
,
limit
:
Number
(
limit
),
where
:
where
,
order
:
[[
'order_id'
,
'
de
sc'
]]
});
let
rental_houses
=
await
this
.
formatRentalHouseBasic
(
rental_houses_results
.
rows
);
let
rental_houses
=
await
this
.
formatRentalHouseBasic
(
rental_houses_results
.
rows
);
rental_houses
=
R
.
project
([
'id'
,
'image'
,
'name'
,
'address'
,
'price'
,
'tags'
,
'favourable_info'
])(
rental_houses
);
rental_houses
=
R
.
project
([
'id'
,
'image'
,
'name'
,
'address'
,
'price'
,
'tags'
,
'favourable_info'
])(
rental_houses
);
...
...
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