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
65a136cd
Commit
65a136cd
authored
Sep 29, 2019
by
任国军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix areas order
parent
2fbb1047
Pipeline
#14437
passed with stage
in 8 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
institution.js
app/service/course/institution.js
+5
-3
No files found.
app/service/course/institution.js
View file @
65a136cd
...
...
@@ -88,7 +88,7 @@ class InstitutionService extends Service {
const
areas_ret
=
await
this
.
getInstitutionAreas
({
institution_id
,
limit
:
1000
});
//校区
const
area_rows
=
areas_ret
.
rows
;
const
area_lbs
=
(
lat
>
0
||
lng
>
0
)
?
await
this
.
computeDistance
(
area_rows
,
{
lat
,
lng
})
:
[];
//计算距离信息
cons
t
areas
=
[];
le
t
areas
=
[];
for
(
let
i
in
area_rows
)
{
...
...
@@ -102,7 +102,7 @@ class InstitutionService extends Service {
if
(
lbs
.
travel_method
===
'walking'
)
{
travel_tips
=
`距我
${
distance
}
km,步行
${
duration
}
分钟`
;
}
if
(
distance
===
0
&&
duration
===
0
)
{
if
(
Number
(
distance
)
===
0
&&
duration
===
0
)
{
travel_tips
=
'暂无法计算出距离'
;
}
if
(
area
.
id
==
area_id
&&
area
.
institution_id
==
institution_id
)
{
...
...
@@ -119,8 +119,10 @@ class InstitutionService extends Service {
travel_tips
,
lat
:
area
.
lat
,
lng
:
area
.
lng
,
distance
:
Number
(
distance
)
===
0
?
999999999.0
:
parseFloat
(
distance
),
});
}
areas
=
_
.
orderBy
(
areas
,
[
'distance'
],
[
'asc'
]);
//是否收藏过
const
collection_ret
=
await
ctx
.
classModel
.
CourseUserCollection
.
one
({
where
:
{
user_uuid
,
institution_id
,
is_deleted
:
0
}
});
...
...
@@ -237,7 +239,7 @@ class InstitutionService extends Service {
const
{
institution_id
,
page
,
limit
}
=
input
;
const
where
=
{
institution_id
};
const
areas
=
await
ctx
.
classModel
.
CourseArea
.
list
({
attributes
,
page
,
limit
,
where
});
return
areas
;
}
...
...
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