Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wx-school-app
Project
Overview
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
姜雷
wx-school-app
Commits
caf61a03
Commit
caf61a03
authored
Jul 04, 2019
by
姜雷
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into test
parents
eb6a9505
bd262fef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
useAllBeanCount.ts
src/hooks/useAllBeanCount.ts
+2
-2
OrderItem.tsx
src/pages/Order/components/OrderItem/OrderItem.tsx
+1
-1
No files found.
src/hooks/useAllBeanCount.ts
View file @
caf61a03
...
@@ -47,10 +47,10 @@ const useAllBeanCount = (
...
@@ -47,10 +47,10 @@ const useAllBeanCount = (
item
.
serviceId
===
'11'
||
item
.
serviceId
===
'11'
||
item
.
serviceId
===
'9'
,
item
.
serviceId
===
'9'
,
);
);
let
commonItem
=
beanAccount
.
find
(
item
=>
item
.
serviceId
===
'1'
);
//
let commonItem = beanAccount.find(item => item.serviceId === '1');
let
beanMap
=
{
let
beanMap
=
{
[
BeanType
.
aimi
]:
aimiItem
?
aimiItem
.
money
:
0
,
[
BeanType
.
aimi
]:
aimiItem
?
aimiItem
.
money
:
0
,
[
BeanType
.
common
]:
commonItem
?
commonItem
.
money
:
0
,
//
[BeanType.common]: commonItem ? commonItem.money : 0,
};
};
for
(
let
index
=
0
;
index
<
serviceList
.
length
;
index
++
)
{
for
(
let
index
=
0
;
index
<
serviceList
.
length
;
index
++
)
{
const
service
=
serviceList
[
index
];
const
service
=
serviceList
[
index
];
...
...
src/pages/Order/components/OrderItem/OrderItem.tsx
View file @
caf61a03
...
@@ -83,7 +83,7 @@ class OrderItem extends Component {
...
@@ -83,7 +83,7 @@ class OrderItem extends Component {
</
View
>
</
View
>
<
View
<
View
className=
{
`OrderItem-price ${orderState === '1' ? 'topay' : ''}`
}
>
className=
{
`OrderItem-price ${orderState === '1' ? 'topay' : ''}`
}
>
¥
{
payableMoney
}
¥
{
payableMoney
.
toFixed
(
2
)
}
</
View
>
</
View
>
</
View
>
</
View
>
);
);
...
...
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