Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
InvestCustomer
Overview
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
1
Merge Requests
1
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
Giang Tran
InvestCustomer
Commits
5c26a7f0
Commit
5c26a7f0
authored
3 years ago
by
Giang Tran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_phase2' of
http://git.dcv.vn/tdgiangdev/InvestCustomer
into dev_phase2
parents
c02924b5
fa86b93c
switch_rsa
…
05_May
build_0106
build_01_July
build_02_July
build_06_07
build_11_June
build_1305
build_1405
build_14_June
build_15_july
build_2405
build_2505
build_2805
build_30_June
build_release_1806
build_server_new
dev_0106
dev_01_July
dev_05_July
dev_09_June
dev_10_June
dev_11_June
dev_14_July
dev_14_May
dev_18_June
dev_2605
dev_phase2
ekyc
enter_smart_otp
fix_bug_image
forgot_smart_otp_pin
func_fingerprint_login
func_smart_otp
new_09_June
new_10_June
phase2_tool
search_period
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
16 deletions
+40
-16
ItemPrice.js
src/Screens/Home/ItemPrice.js
+22
-9
PriceListView.js
src/Screens/Home/PriceListView.js
+18
-7
No files found.
src/Screens/Home/ItemPrice.js
View file @
5c26a7f0
...
@@ -4,6 +4,7 @@ import {
...
@@ -4,6 +4,7 @@ import {
Text
,
Text
,
StyleSheet
,
StyleSheet
,
Image
,
Image
,
TouchableOpacity
}
from
'react-native'
;
}
from
'react-native'
;
import
{
import
{
getFontXD
,
getFontXD
,
...
@@ -12,12 +13,12 @@ import {
...
@@ -12,12 +13,12 @@ import {
}
from
'../../Config/Functions'
;
}
from
'../../Config/Functions'
;
import
R
from
'../../assets/R'
;
import
R
from
'../../assets/R'
;
import
Block
from
'../../components/Block'
;
import
Block
from
'../../components/Block'
;
import
*
as
Progress
from
'react-native-progress'
;
const
ItemPrice
=
(
props
)
=>
{
const
ItemPrice
=
(
props
)
=>
{
const
{
item
,
isEndItem
}
=
props
;
const
{
item
,
isEndItem
,
onPress
}
=
props
;
return
(
return
(
<
View
style
=
{[
styles
.
container
,
isEndItem
&&
{
marginBottom
:
HEIGHTXD
(
100
)},
{
paddingBottom
:
HEIGHTXD
(
20
)}]}
>
<
View
style
=
{[
styles
.
container
,
isEndItem
&&
{
marginBottom
:
HEIGHTXD
(
100
)},
{
paddingBottom
:
HEIGHTXD
(
20
)}]}
>
<
TouchableOpacity
onPress
=
{
onPress
}
>
<
Block
flex
=
{
1
}
row
>
<
Block
flex
=
{
1
}
row
>
<
View
style
=
{{
flex
:
0.8
,
flexDirection
:
'column'
,
justifyContent
:
'center'
}}
>
<
View
style
=
{{
flex
:
0.8
,
flexDirection
:
'column'
,
justifyContent
:
'center'
}}
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
marginBottom
:
HEIGHTXD
(
5
)}]}
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
marginBottom
:
HEIGHTXD
(
5
)}]}
>
...
@@ -47,12 +48,17 @@ const ItemPrice = (props) => {
...
@@ -47,12 +48,17 @@ const ItemPrice = (props) => {
justifyContent
:
'space-between'
,
justifyContent
:
'space-between'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
}}
>
}}
>
<
Image
source
=
{
item
.
is_up
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
item
.
is_up
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
,
color
:
item
.
is_up
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
style
=
{
styles
.
imgIcon
}
/
>
<
Text
style
=
{[
styles
.
txtBlack
,
{
flexWrap
:
'wrap'
,
color
:
item
.
is_up
?
R
.
colors
.
green
:
R
.
colors
.
red2
,
}]}
>
{
item
.
change
}
{
item
.
change
}
<
/Text
>
<
/Text
>
<
/View
>
<
/View
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
item
.
is_up
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
{
`
${
item
.
change_percent
}
%`
}
<
/Text
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
item
.
is_up
?
R
.
colors
.
green
:
R
.
colors
.
red2
}]}
>
{
`
${
item
.
change_percent
}
%`
}
<
/Text
>
<
/View
>
<
/View
>
<
/Block
>
<
/Block
>
<
Block
padding
=
{[
0
,
0
]}
space
=
{
'between'
}
flex
=
{
1
}
>
<
Block
padding
=
{[
0
,
0
]}
space
=
{
'between'
}
flex
=
{
1
}
>
...
@@ -75,7 +81,8 @@ const ItemPrice = (props) => {
...
@@ -75,7 +81,8 @@ const ItemPrice = (props) => {
ellipsizeMode
=
'tail'
>
ellipsizeMode
=
'tail'
>
{
item
.
open_price
}
{
item
.
open_price
}
<
/Text
>
<
/Text
>
<
Image
source
=
{
item
.
is_up
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
item
.
is_up
?
R
.
images
.
iconTriangleUp
:
R
.
images
.
iconTriangleDown
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
View
<
View
style
=
{{
style
=
{{
...
@@ -85,7 +92,7 @@ const ItemPrice = (props) => {
...
@@ -85,7 +92,7 @@ const ItemPrice = (props) => {
alignItems
:
'center'
,
alignItems
:
'center'
,
}}
>
}}
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
R
.
colors
.
gray6
}]}
>
{
item
.
close_price
}
<
/Text
>
<
Text
style
=
{[
styles
.
txtMoney
,
{
color
:
R
.
colors
.
gray6
}]}
>
{
item
.
close_price
}
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconCheck2
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconCheck2
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
/Block
>
<
/Block
>
...
@@ -126,7 +133,13 @@ const ItemPrice = (props) => {
...
@@ -126,7 +133,13 @@ const ItemPrice = (props) => {
<
/Block
>
<
/Block
>
<
Text
style
=
{[
styles
.
txtTime
]}
>
<
Text
style
=
{[
styles
.
txtTime
]}
>
{
item
.
time
}
<
/Text
>
{
item
.
time
}
<
/Text
>
<
View
style
=
{{
height
:
HEIGHTXD
(
1
),
backgroundColor
:
R
.
colors
.
gray
,
marginTop
:
HEIGHTXD
(
3
),
marginBottom
:
HEIGHTXD
(
3
)}}
><
/View
>
<
View
style
=
{{
height
:
HEIGHTXD
(
1
),
backgroundColor
:
R
.
colors
.
gray
,
marginTop
:
HEIGHTXD
(
3
),
marginBottom
:
HEIGHTXD
(
3
),
}}
><
/View
>
<
/TouchableOpacity
>
<
/View
>
<
/View
>
);
);
};
};
...
@@ -182,5 +195,5 @@ const styles = StyleSheet.create({
...
@@ -182,5 +195,5 @@ const styles = StyleSheet.create({
width
:
WIDTHXD
(
20
),
width
:
WIDTHXD
(
20
),
height
:
WIDTHXD
(
20
),
height
:
WIDTHXD
(
20
),
resizeMode
:
'contain'
,
resizeMode
:
'contain'
,
}
}
,
});
});
This diff is collapsed.
Click to expand it.
src/Screens/Home/PriceListView.js
View file @
5c26a7f0
...
@@ -11,9 +11,12 @@ import {
...
@@ -11,9 +11,12 @@ import {
import
{
getFontXD
,
HEIGHTXD
,
WIDTHXD
}
from
'../../Config/Functions'
;
import
{
getFontXD
,
HEIGHTXD
,
WIDTHXD
}
from
'../../Config/Functions'
;
import
R
from
'../../assets/R'
;
import
R
from
'../../assets/R'
;
import
ItemPrice
from
'./ItemPrice'
;
import
ItemPrice
from
'./ItemPrice'
;
import
{
PRODUCTDETAIL
}
from
'../../routers/ScreenNames'
;
import
{
useNavigation
}
from
'@react-navigation/native'
;
const
PriceListView
=
(
props
)
=>
{
const
PriceListView
=
(
props
)
=>
{
const
{
setFilterId
,
filters
,
dataPrice
,
filterId
}
=
props
;
const
{
setFilterId
,
filters
,
dataPrice
,
filterId
}
=
props
;
const
navigate
=
useNavigation
();
return
(
return
(
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{
styles
.
headerContainer
}
>
<
View
style
=
{
styles
.
headerContainer
}
>
...
@@ -41,24 +44,32 @@ const PriceListView = (props) => {
...
@@ -41,24 +44,32 @@ const PriceListView = (props) => {
data
=
{
dataPrice
}
data
=
{
dataPrice
}
ListHeaderComponent
=
{()
=>
ListHeaderComponent
=
{()
=>
<
View
style
=
{[
styles
.
container
]}
>
<
View
style
=
{[
styles
.
container
]}
>
<
View
style
=
{[
styles
.
headerContent
,
{
flex
:
0.3
,
justifyContent
:
'flex-start'
,
alignItems
:
'center'
,}]}
>
<
View
style
=
{[
styles
.
headerContent
,
{
flex
:
0.3
,
justifyContent
:
'flex-start'
,
alignItems
:
'center'
,
}]}
>
<
Text
>
T
ê
n
<
/Text
>
<
Text
>
T
ê
n
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
View
style
=
{[
styles
.
headerContent
,
{
flex
:
1.5
}]}
>
<
View
style
=
{[
styles
.
headerContent
,
{
flex
:
1.5
}]}
>
<
Text
>
T
ỷ
l
ệ
thay
đổ
i
<
/Text
>
<
Text
>
T
ỷ
l
ệ
thay
đổ
i
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
View
style
=
{[
styles
.
headerContent
]}
>
<
View
style
=
{[
styles
.
headerContent
]}
>
<
Text
>
Gi
á
m
ở
/
đó
ng
<
/Text
>
<
Text
>
Gi
á
m
ở
/
đó
ng
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
View
style
=
{[
styles
.
headerContent
]}
>
<
View
style
=
{[
styles
.
headerContent
]}
>
<
Text
>
Gi
á
cao
/
th
ấ
p
<
/Text
>
<
Text
>
Gi
á
cao
/
th
ấ
p
<
/Text
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconSort
}
style
=
{
styles
.
imgIcon
}
/
>
<
/View
>
<
/View
>
<
/View>
}
<
/View>
}
renderItem
=
{({
item
})
=>
<
ItemPrice
item
=
{
item
}
/>
}
renderItem
=
{({
item
})
=>
<
ItemPrice
item
=
{
item
}
onPress
=
{()
=>
navigate
.
navigate
(
PRODUCTDETAIL
,
{
id
:
item
.
id
,
name
:
item
.
name
,
})}
/>
}
/>
/>
<
/View
>
<
/View
>
);
);
...
@@ -95,7 +106,7 @@ const styles = StyleSheet.create({
...
@@ -95,7 +106,7 @@ const styles = StyleSheet.create({
flex
:
1
,
flex
:
1
,
flexDirection
:
'row'
,
flexDirection
:
'row'
,
marginHorizontal
:
WIDTHXD
(
30
),
marginHorizontal
:
WIDTHXD
(
30
),
marginBottom
:
HEIGHTXD
(
10
)
marginBottom
:
HEIGHTXD
(
10
)
,
},
},
headerContent
:
{
headerContent
:
{
...
...
This diff is collapsed.
Click to expand it.
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