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
b20a248d
Commit
b20a248d
authored
Apr 13, 2021
by
Giang Tran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update screen legaldocument
parent
3cd06fce
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
166 additions
and
149 deletions
+166
-149
project.pbxproj
ios/Invest.xcodeproj/project.pbxproj
+2
-2
Info.plist
ios/Invest/Info.plist
+1
-1
Functions.js
src/Config/Functions.js
+14
-1
Contract.js
src/Screens/Account/Contract.js
+19
-18
History.js
src/Screens/Action/History/History.js
+10
-9
HistoryView.js
src/Screens/Action/History/HistoryView.js
+44
-79
Item.js
src/Screens/Action/History/Item.js
+23
-27
Item.js
src/Screens/Action/Wallet/Tab/Item.js
+1
-5
LegalDocument.js
src/Screens/LegalDocument/LegalDocument.js
+13
-0
NewFeed.js
src/Screens/NewFeed/NewFeed.js
+5
-5
NotificaitonView.js
src/Screens/Notification/NotificaitonView.js
+22
-1
Notification.js
src/Screens/Notification/Notification.js
+0
-1
images.js
src/assets/images.js
+1
-0
iconPaper.png
src/assets/images/iconPaper.png
+0
-0
Drawer.js
src/components/Header/Drawer.js
+7
-0
ScreenNames.js
src/routers/ScreenNames.js
+2
-0
StackNavigation.js
src/routers/StackNavigation.js
+2
-0
No files found.
ios/Invest.xcodeproj/project.pbxproj
View file @
b20a248d
...
@@ -903,7 +903,7 @@
...
@@ -903,7 +903,7 @@
CODE_SIGN_ENTITLEMENTS
=
Invest/Invest.entitlements
;
CODE_SIGN_ENTITLEMENTS
=
Invest/Invest.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
1
6
;
CURRENT_PROJECT_VERSION
=
1
7
;
DEVELOPMENT_TEAM
=
MXZ24GRH48
;
DEVELOPMENT_TEAM
=
MXZ24GRH48
;
ENABLE_BITCODE
=
NO
;
ENABLE_BITCODE
=
NO
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
GCC_PREPROCESSOR_DEFINITIONS
=
(
...
@@ -936,7 +936,7 @@
...
@@ -936,7 +936,7 @@
CODE_SIGN_ENTITLEMENTS
=
Invest/Invest.entitlements
;
CODE_SIGN_ENTITLEMENTS
=
Invest/Invest.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
1
6
;
CURRENT_PROJECT_VERSION
=
1
7
;
DEVELOPMENT_TEAM
=
MXZ24GRH48
;
DEVELOPMENT_TEAM
=
MXZ24GRH48
;
INFOPLIST_FILE
=
Invest/Info.plist
;
INFOPLIST_FILE
=
Invest/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
...
...
ios/Invest/Info.plist
View file @
b20a248d
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
k
e
y
>
NSLocationWhenInUseUsageDescription
<
/k
e
y
>
<
k
e
y
>
NSLocationWhenInUseUsageDescription
<
/k
e
y
>
<
string
/
>
<
string
><
/string
>
<
k
e
y
>
NSPhotoLibraryUsageDescription
<
/k
e
y
>
<
k
e
y
>
NSPhotoLibraryUsageDescription
<
/k
e
y
>
<
string
>
To
upload
images
<
/string
>
<
string
>
To
upload
images
<
/string
>
<
k
e
y
>
UIAppFonts
<
/k
e
y
>
<
k
e
y
>
UIAppFonts
<
/k
e
y
>
...
...
src/Config/Functions.js
View file @
b20a248d
...
@@ -98,7 +98,20 @@ export const Gender = {
...
@@ -98,7 +98,20 @@ export const Gender = {
male
:
0
,
male
:
0
,
female
:
1
,
female
:
1
,
};
};
export
const
converType
=
(
type
)
=>
{
if
(
type
==
'DEPOSIT'
)
return
'Nạp tiền'
;
return
'Rút tiền'
;
};
export
const
converStatus
=
(
status
)
=>
{
switch
(
status
)
{
case
0
:
return
'Chờ xử lý'
;
case
1
:
return
'Thành công'
;
case
2
:
return
'Huỷ'
;
}
};
export
const
toPriceVnd
=
(
str
)
=>
{
export
const
toPriceVnd
=
(
str
)
=>
{
if
(
str
)
{
if
(
str
)
{
let
stringPrice
=
str
.
toString
().
split
(
'.'
);
let
stringPrice
=
str
.
toString
().
split
(
'.'
);
...
...
src/Screens/Account/Contract.js
View file @
b20a248d
import
React
from
'react'
;
import
React
from
'react'
;
import
{
View
,
Text
}
from
'react-native'
;
import
{
View
,
Text
}
from
'react-native'
;
import
HeaderBack
from
'../../components/Header/HeaderBack'
;
import
HeaderBack
from
'../../components/Header/HeaderBack'
;
import
{
connect
}
from
'react-redux'
;
import
{
WebView
}
from
'react-native-webview'
;
const
Contract
=
(
props
)
=>
{
const
Contract
=
(
props
)
=>
{
console
.
log
(
props
.
user
);
return
(
return
(
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
HeaderBack
title
=
{
'Hợp đồng'
}
/
>
<
HeaderBack
isWhite
=
{
true
}
title
=
{
'Hợp đồng'
}
/
>
<
View
style
=
{{
<
WebView
flex
:
1
,
androidHardwareAccelerationDisabled
=
{
true
}
paddingHorizontal
:
20
,
source
=
{{
justifyContent
:
'center'
,
uri
:
alignItems
:
'center'
,
'http://api.dcvinvest.com/webview/contracts/show/'
+
props
.
user
.
uid
,
}}
>
}}
<
Text
/
>
style
=
{{
fontSize
:
18
,
fontWeight
:
'bold'
,
textAlign
:
'center'
,
}}
>
T
í
nh
n
ă
ng
đ
ang
đượ
c
ph
á
t
tri
ể
n
,
vui
l
ò
ng
quay
l
ạ
i
sau
!
<
/Text
>
<
/View
>
<
/View
>
<
/View
>
);
);
};
};
export
default
Contract
;
const
mapStateToProps
=
(
state
)
=>
{
return
{
user
:
state
.
userReducer
,
};
};
export
default
connect
(
mapStateToProps
,
{})(
Contract
);
src/Screens/Action/History/History.js
View file @
b20a248d
...
@@ -4,27 +4,26 @@ import HistoryView from './HistoryView';
...
@@ -4,27 +4,26 @@ import HistoryView from './HistoryView';
import
{
getListTransaction
}
from
'../../../apis/Functions/Widthdraw'
;
import
{
getListTransaction
}
from
'../../../apis/Functions/Widthdraw'
;
const
History
=
(
props
)
=>
{
const
History
=
(
props
)
=>
{
const
[
selected
,
setSelected
]
=
useState
(
''
);
const
[
selected
,
setSelected
]
=
useState
(
'
ALL
'
);
const
[
page
,
setPage
]
=
useState
(
1
);
const
[
page
,
setPage
]
=
useState
(
1
);
const
[
data
,
setData
]
=
useState
([]);
const
[
data
,
setData
]
=
useState
([]);
const
[
tottalPage
,
setTotalPage
]
=
useState
(
1
);
const
[
tottalPage
,
setTotalPage
]
=
useState
(
1
);
const
[
isRefresh
,
setisRefresh
]
=
useState
(
false
);
const
[
isRefresh
,
setisRefresh
]
=
useState
(
false
);
const
[
fillters
,
setFillters
]
=
useState
([]);
useEffect
(()
=>
{
useEffect
(()
=>
{
getData
();
getData
();
},
[]);
},
[]);
//
useEffect(() => {
useEffect
(()
=>
{
//
getData();
getData
();
//
}, [selected]);
},
[
selected
]);
const
getData
=
async
()
=>
{
const
getData
=
async
()
=>
{
setisRefresh
(
true
);
setisRefresh
(
true
);
setPage
(
1
);
setPage
(
1
);
const
res
=
await
getListTransaction
({
const
res
=
await
getListTransaction
({
keyword
:
''
,
keyword
:
''
,
type
:
'ALL'
,
type
:
selected
,
platform
:
Platform
.
OS
,
platform
:
Platform
.
OS
,
page_size
:
10
,
page_size
:
10
,
status
:
-
1
,
status
:
-
1
,
...
@@ -32,11 +31,12 @@ const History = (props) => {
...
@@ -32,11 +31,12 @@ const History = (props) => {
start_date
:
''
,
start_date
:
''
,
end_date
:
''
,
end_date
:
''
,
});
});
console
.
log
(
res
);
setisRefresh
(
false
);
setisRefresh
(
false
);
if
((
res
.
data
.
code
=
200
&&
res
.
data
.
data
))
{
if
((
res
.
data
.
code
=
200
&&
res
.
data
.
data
))
{
setData
(
res
.
data
.
data
);
setData
(
res
.
data
.
data
);
setTotalPage
(
res
.
data
.
meta
.
pages
);
setTotalPage
(
res
.
data
.
meta
.
pages
);
console
.
log
(
res
.
data
.
data
);
}
else
{
}
else
{
Alert
.
alert
(
'Thông báo!'
,
res
.
data
.
message
);
Alert
.
alert
(
'Thông báo!'
,
res
.
data
.
message
);
}
}
...
@@ -47,8 +47,7 @@ const History = (props) => {
...
@@ -47,8 +47,7 @@ const History = (props) => {
};
};
const
onLoadMore
=
()
=>
{
const
onLoadMore
=
()
=>
{
console
.
log
(
tottalPage
);
if
(
page
<
tottalPage
)
getDataLoadMore
();
// if (page < tottalPage) getDataLoadMore();
};
};
const
getDataLoadMore
=
async
()
=>
{
const
getDataLoadMore
=
async
()
=>
{
...
@@ -77,6 +76,8 @@ const History = (props) => {
...
@@ -77,6 +76,8 @@ const History = (props) => {
isRefresh
=
{
isRefresh
}
isRefresh
=
{
isRefresh
}
onRefresh
=
{
onRefresh
}
onRefresh
=
{
onRefresh
}
data
=
{
data
}
data
=
{
data
}
selected
=
{
selected
}
setSelected
=
{
setSelected
}
/
>
/
>
);
);
};
};
...
...
src/Screens/Action/History/HistoryView.js
View file @
b20a248d
import
React
,
{
useState
}
from
'react'
;
import
React
,
{
useState
}
from
'react'
;
import
{
View
,
Text
,
FlatList
,
TouchableOpacity
,
StyleSheet
}
from
'react-native'
;
import
{
View
,
Text
,
FlatList
,
TouchableOpacity
,
StyleSheet
,
ScrollView
,
}
from
'react-native'
;
import
HeaderBack
from
'../../../components/Header/HeaderBack'
;
import
HeaderBack
from
'../../../components/Header/HeaderBack'
;
import
Item
from
'./Item'
;
import
Item
from
'./Item'
;
import
{
getFontXD
}
from
'../../../Config/Functions'
;
import
{
getFontXD
}
from
'../../../Config/Functions'
;
const
Fillters
=
[
const
Fillters
=
[
{
{
id
:
'1'
,
id
:
'1'
,
name
:
'Tất cả'
,
name
:
'Tất cả'
,
value
:
'
all
'
,
value
:
'
ALL
'
,
},
},
{
{
id
:
'
4
'
,
id
:
'
2
'
,
name
:
'
Rút
tiền'
,
name
:
'
Nạp
tiền'
,
value
:
'
withdraw
'
,
value
:
'
DEPOSIT
'
,
},
},
{
{
id
:
'
5
'
,
id
:
'
3
'
,
name
:
'
Nạp
tiền'
,
name
:
'
Rút
tiền'
,
value
:
'
deposit
'
,
value
:
'
WITHDRAW
'
,
},
},
{
{
id
:
'
6
'
,
id
:
'
4
'
,
name
:
'Chuyển khoản'
,
name
:
'Chuyển khoản'
,
value
:
'
exchange
'
,
value
:
'
TRANSFER
'
,
},
},
];
];
// const data = [
// {
// id: '1',
// money: 10000000,
// content: 'Hoạt động: Nạp tiền',
// status: 1,
// date: '20/02/2021',
// },
// {
// id: '2',
// money: 2000000,
// content: 'Hoạt động: Nạp tiền',
// status: 1,
// date: '20/02/2021',
// },
// {
// id: '3',
// day: '20',
// money: 3000000,
// content: 'Hoạt động: Nạp tiền',
// status: 1,
// date: '20/02/2021',
// },
// {
// id: '4',
// money: 4000000,
// content: 'Hoạt động: Rút tiền',
// status: 2,
// date: '20/02/2021',
// },
// {
// id: '5',
// money: 9000000,
// content: 'Hoạt động: Nạp tiền',
// status: 1,
// date: '20/02/2021',
// },
// {
// id: '6',
// money: 4000000,
// content: 'Hoạt động: Rút tiền',
// status: 2,
// date: '20/02/2021',
// },
// {
// id: '7',
// money: 9000000,
// content: 'Hoạt động: Nạp tiền',
// status: 1,
// date: '20/02/2021',
// },
// ];
const
HistoryView
=
(
props
)
=>
{
const
HistoryView
=
(
props
)
=>
{
const
{
isRefresh
,
onRefresh
,
onLoadMore
,
data
}
=
props
;
const
{
isRefresh
,
onRefresh
,
onLoadMore
,
data
,
selected
,
setSelected
}
=
props
;
const
[
selected
,
setSelected
]
=
useState
(
'1'
);
return
(
return
(
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
HeaderBack
isWhite
=
{
true
}
title
=
{
'LỊCH SỬ'
}
/
>
<
HeaderBack
isWhite
=
{
true
}
title
=
{
'LỊCH SỬ'
}
/
>
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{
styles
.
headerContainer
}
>
<
View
style
=
{
styles
.
headerContainer
}
>
<
FlatList
{
Fillters
.
map
((
e
)
=>
(
showsHorizontalScrollIndicator
=
{
false
}
horizontal
data
=
{
Fillters
}
keyExtractor
=
{(
item
)
=>
item
.
id
}
renderItem
=
{({
item
})
=>
(
<
TouchableOpacity
<
TouchableOpacity
onPress
=
{()
=>
setSelected
(
item
.
id
)}
key
=
{
e
.
value
}
onPress
=
{()
=>
setSelected
(
e
.
value
)}
style
=
{[
style
=
{[
styles
.
itemFillter
,
styles
.
itemFillter
,
selected
==
item
.
id
?
{
borderColor
:
'#1473E6'
}
:
null
,
selected
==
e
.
value
?
{
borderColor
:
'#1473E6'
}
:
null
,
]}
>
]}
>
<
Text
<
Text
style
=
{[
style
=
{[
styles
.
txtFillter
,
styles
.
txtFillter
,
selected
==
item
.
id
?
{
color
:
'#1473E6'
}
:
{},
selected
==
e
.
value
?
{
color
:
'#1473E6'
}
:
{},
]}
>
]}
>
{
item
.
name
}
{
e
.
name
}
<
/Text
>
<
/Text
>
<
/TouchableOpacity
>
<
/TouchableOpacity
>
)}
))}
/
>
<
/View
>
<
/View
>
{
data
.
length
==
0
?
(
<
View
style
=
{{
justifyContent
:
'center'
,
alignItems
:
'center'
,
flex
:
1
}}
>
<
Text
style
=
{{
fontSize
:
getFontXD
(
46
),
fontWeight
:
'bold'
,
}}
>
Kh
ô
ng
c
ó
giao
d
ị
ch
n
à
o
!
<
/Text
>
<
/View
>
)
:
(
<
FlatList
<
FlatList
style
=
{{
flex
:
1
}}
style
=
{{
flex
:
1
}}
refreshing
=
{
isRefresh
}
refreshing
=
{
isRefresh
}
...
@@ -123,6 +84,7 @@ const HistoryView = (props) => {
...
@@ -123,6 +84,7 @@ const HistoryView = (props) => {
data
=
{
data
}
data
=
{
data
}
renderItem
=
{({
item
})
=>
<
Item
item
=
{
item
}
/>
}
renderItem
=
{({
item
})
=>
<
Item
item
=
{
item
}
/>
}
/>
/>
)}
<
/View
>
<
/View
>
<
/View
>
<
/View
>
);
);
...
@@ -132,6 +94,10 @@ const styles = StyleSheet.create({
...
@@ -132,6 +94,10 @@ const styles = StyleSheet.create({
headerContainer
:
{
headerContainer
:
{
paddingVertical
:
10
,
paddingVertical
:
10
,
backgroundColor
:
'white'
,
backgroundColor
:
'white'
,
flexDirection
:
'row'
,
justifyContent
:
'space-around'
,
alignItems
:
'center'
,
paddingHorizontal
:
10
,
},
},
itemFillter
:
{
itemFillter
:
{
borderRadius
:
10
,
borderRadius
:
10
,
...
@@ -139,7 +105,6 @@ const styles = StyleSheet.create({
...
@@ -139,7 +105,6 @@ const styles = StyleSheet.create({
paddingHorizontal
:
10
,
paddingHorizontal
:
10
,
borderWidth
:
1
,
borderWidth
:
1
,
borderColor
:
'#929292'
,
borderColor
:
'#929292'
,
marginLeft
:
15
,
minWidth
:
70
,
minWidth
:
70
,
},
},
txtFillter
:
{
txtFillter
:
{
...
...
src/Screens/Action/History/Item.js
View file @
b20a248d
...
@@ -5,6 +5,8 @@ import {
...
@@ -5,6 +5,8 @@ import {
HEIGHTXD
,
HEIGHTXD
,
WIDTHXD
,
WIDTHXD
,
toPriceVnd
,
toPriceVnd
,
converType
,
converStatus
,
}
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'
;
...
@@ -16,16 +18,11 @@ const Item = (props) => {
...
@@ -16,16 +18,11 @@ const Item = (props) => {
// console.log('item---', item.status);
// console.log('item---', item.status);
const
navigate
=
useNavigation
();
const
navigate
=
useNavigation
();
return
(
return
(
<
TouchableOpacity
onPress
=
{()
=>
console
.
log
(
'HEllo'
)}
>
<
View
style
=
{
styles
.
container
}
>
<
View
style
=
{
styles
.
container
}
>
<
Block
flex
=
{
1
}
row
>
<
Block
flex
=
{
1
}
row
>
<
View
style
=
{
styles
.
wrapLeft
}
/
>
<
View
style
=
{
styles
.
wrapLeft
}
/
>
<
View
style
=
{
styles
.
wrapDate
}
>
<
View
style
=
{
styles
.
wrapDate
}
>
{
item
.
status
==
1
?
(
<
Image
source
=
{{
uri
:
item
.
icon
}}
style
=
{
styles
.
imgIcon
}
/
>
<
Image
source
=
{
R
.
images
.
iconRecharge
}
style
=
{
styles
.
imgIcon
}
/
>
)
:
(
<
Image
source
=
{
R
.
images
.
iconWithdrawal
}
style
=
{
styles
.
imgIcon
}
/
>
)}
<
/View
>
<
/View
>
<
Block
<
Block
style
=
{{
justifyContent
:
'center'
}}
style
=
{{
justifyContent
:
'center'
}}
...
@@ -41,37 +38,26 @@ const Item = (props) => {
...
@@ -41,37 +38,26 @@ const Item = (props) => {
style
=
{{
style
=
{{
alignItems
:
'flex-start'
,
alignItems
:
'flex-start'
,
}}
>
}}
>
<
Text
style
=
{
styles
.
txtBlack
}
>
{
item
.
content
}
<
/Text
>
<
Text
style
=
{
styles
.
txtBlack
}
>
<
Text
style
=
{
styles
.
txt
}
>
{
item
.
date
}
<
/Text
>
{
converType
(
item
.
transection_category
)}
<
/Text
>
<
Text
style
=
{
styles
.
txt
}
>
{
item
.
transection_date_timestamp
}
<
/Text
>
<
/View
>
<
/View
>
<
View
style
=
{{
alignItems
:
'flex-end'
}}
>
<
View
style
=
{{
alignItems
:
'flex-end'
}}
>
{
item
.
status
==
1
?
(
<
Text
<
Text
style
=
{{
style
=
{[
fontSize
:
getFontXD
(
42
),
styles
.
txtMoney
,
fontWeight
:
'bold'
,
item
.
status
==
1
?
{
color
:
'#1473E6'
}
:
null
,
color
:
'#F99D1D'
,
]}
>
}}
>
{
toPriceVnd
(
item
.
amount
)}
Đ
{
toPriceVnd
(
item
.
money
)}
Đ
<
/Text
>
)
:
(
<
Text
style
=
{{
fontSize
:
getFontXD
(
42
),
fontWeight
:
'bold'
,
color
:
'#1473E6'
,
}}
>
{
toPriceVnd
(
item
.
money
)}
Đ
<
/Text
>
<
/Text
>
)}
<
Text
style
=
{
styles
.
txt
}
>
{
converStatus
(
item
.
status
)}
<
/Text
>
<
Text
style
=
{
styles
.
txt
}
>
Ho
à
n
t
ấ
t
<
/Text
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
/Block
>
<
/Block
>
<
/Block
>
<
/Block
>
<
/View
>
<
/View
>
<
/TouchableOpacity
>
);
);
};
};
...
@@ -109,10 +95,20 @@ const styles = StyleSheet.create({
...
@@ -109,10 +95,20 @@ const styles = StyleSheet.create({
txt
:
{
txt
:
{
fontSize
:
getFontXD
(
36
),
fontSize
:
getFontXD
(
36
),
color
:
'#C4C4C4'
,
color
:
'#C4C4C4'
,
marginTop
:
10
,
fontStyle
:
'italic'
,
},
},
imgIcon
:
{
imgIcon
:
{
width
:
WIDTHXD
(
178
),
width
:
WIDTHXD
(
178
),
height
:
HEIGHTXD
(
178
),
height
:
HEIGHTXD
(
178
),
resizeMode
:
'contain'
,
resizeMode
:
'contain'
,
},
},
txtMoney
:
{
fontSize
:
getFontXD
(
42
),
fontWeight
:
'bold'
,
color
:
'#F99D1D'
,
},
txtBlack
:
{
fontSize
:
getFontXD
(
42
),
},
});
});
src/Screens/Action/Wallet/Tab/Item.js
View file @
b20a248d
...
@@ -5,17 +5,13 @@ import {
...
@@ -5,17 +5,13 @@ import {
HEIGHTXD
,
HEIGHTXD
,
WIDTHXD
,
WIDTHXD
,
toPriceVnd
,
toPriceVnd
,
converType
,
}
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
{
useNavigation
}
from
'@react-navigation/native'
;
import
{
useNavigation
}
from
'@react-navigation/native'
;
import
{
DETAIL_REQUIRE_MONEY
}
from
'../../../../routers/ScreenNames'
;
import
{
DETAIL_REQUIRE_MONEY
}
from
'../../../../routers/ScreenNames'
;
const
converType
=
(
type
)
=>
{
if
((
type
=
'DEPOSIT'
))
return
'Nạp tiền'
;
return
'Rút tiền'
;
};
const
Item
=
(
props
)
=>
{
const
Item
=
(
props
)
=>
{
const
{
item
}
=
props
;
const
{
item
}
=
props
;
const
navigate
=
useNavigation
();
const
navigate
=
useNavigation
();
...
...
src/Screens/LegalDocument/LegalDocument.js
0 → 100644
View file @
b20a248d
import
React
from
'react'
;
import
{
View
,
Text
}
from
'react-native'
;
import
HeaderBack
from
'../../components/Header/HeaderBack'
;
const
LegalDocument
=
(
props
)
=>
{
return
(
<
View
style
=
{{
flex
:
1
}}
>
<
HeaderBack
title
=
{
'Giấy tờ pháp lý'
}
/
>
<
/View
>
);
};
export
default
LegalDocument
;
src/Screens/NewFeed/NewFeed.js
View file @
b20a248d
...
@@ -27,11 +27,6 @@ const NewFeed = (props) => {
...
@@ -27,11 +27,6 @@ const NewFeed = (props) => {
style
:
{
backgroundColor
:
'white'
},
style
:
{
backgroundColor
:
'white'
},
}}
>
}}
>
<
Tab
.
Screen
<
Tab
.
Screen
name
=
"CALENDAR"
component
=
{
Calendar
}
options
=
{{
tabBarLabel
:
'Lịch thị trường'
}}
/
>
<
Tab
.
Screen
name
=
"Tab1"
name
=
"Tab1"
component
=
{
Tab1
}
component
=
{
Tab1
}
options
=
{{
tabBarLabel
:
'Tin tức'
}}
options
=
{{
tabBarLabel
:
'Tin tức'
}}
...
@@ -51,6 +46,11 @@ const NewFeed = (props) => {
...
@@ -51,6 +46,11 @@ const NewFeed = (props) => {
component
=
{
Trading
}
component
=
{
Trading
}
options
=
{{
tabBarLabel
:
'Biểu đồ'
}}
options
=
{{
tabBarLabel
:
'Biểu đồ'
}}
/
>
/
>
<
Tab
.
Screen
name
=
"CALENDAR"
component
=
{
Calendar
}
options
=
{{
tabBarLabel
:
'Lịch thị trường'
}}
/
>
<
/Tab.Navigator
>
<
/Tab.Navigator
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
...
...
src/Screens/Notification/NotificaitonView.js
View file @
b20a248d
...
@@ -21,6 +21,11 @@ const Fillters = [
...
@@ -21,6 +21,11 @@ const Fillters = [
name
:
'Rút tiền'
,
name
:
'Rút tiền'
,
value
:
'WITHDRAW'
,
value
:
'WITHDRAW'
,
},
},
{
id
:
'4'
,
name
:
'Chuyển khoản'
,
value
:
'TRANSFER'
,
},
];
];
const
NotificaitonView
=
(
props
)
=>
{
const
NotificaitonView
=
(
props
)
=>
{
...
@@ -48,6 +53,17 @@ const NotificaitonView = (props) => {
...
@@ -48,6 +53,17 @@ const NotificaitonView = (props) => {
<
/TouchableOpacity
>
<
/TouchableOpacity
>
))}
))}
<
/View
>
<
/View
>
{
data
.
length
==
0
?
(
<
View
style
=
{{
justifyContent
:
'center'
,
alignItems
:
'center'
,
flex
:
1
}}
>
<
Text
style
=
{{
fontSize
:
getFontXD
(
46
),
fontWeight
:
'bold'
,
}}
>
Kh
ô
ng
c
ó
th
ô
ng
b
á
o
n
à
o
!
<
/Text
>
<
/View
>
)
:
(
<
FlatList
<
FlatList
keyExtractor
=
{(
item
)
=>
item
.
id
}
keyExtractor
=
{(
item
)
=>
item
.
id
}
data
=
{
data
}
data
=
{
data
}
...
@@ -59,6 +75,7 @@ const NotificaitonView = (props) => {
...
@@ -59,6 +75,7 @@ const NotificaitonView = (props) => {
}}
}}
renderItem
=
{({
item
})
=>
<
Item
item
=
{
item
}
/>
}
renderItem
=
{({
item
})
=>
<
Item
item
=
{
item
}
/>
}
/>
/>
)}
<
/View
>
<
/View
>
);
);
};
};
...
@@ -70,6 +87,7 @@ const styles = StyleSheet.create({
...
@@ -70,6 +87,7 @@ const styles = StyleSheet.create({
flexDirection
:
'row'
,
flexDirection
:
'row'
,
justifyContent
:
'space-around'
,
justifyContent
:
'space-around'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
paddingHorizontal
:
10
,
},
},
itemFillter
:
{
itemFillter
:
{
borderRadius
:
10
,
borderRadius
:
10
,
...
@@ -77,7 +95,6 @@ const styles = StyleSheet.create({
...
@@ -77,7 +95,6 @@ const styles = StyleSheet.create({
paddingHorizontal
:
10
,
paddingHorizontal
:
10
,
borderWidth
:
1
,
borderWidth
:
1
,
borderColor
:
'#929292'
,
borderColor
:
'#929292'
,
marginLeft
:
15
,
minWidth
:
80
,
minWidth
:
80
,
justifyContent
:
'center'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
alignItems
:
'center'
,
...
@@ -87,6 +104,10 @@ const styles = StyleSheet.create({
...
@@ -87,6 +104,10 @@ const styles = StyleSheet.create({
color
:
'#929292'
,
color
:
'#929292'
,
fontWeight
:
'bold'
,
fontWeight
:
'bold'
,
},
},
txtTitle
:
{
fontSize
:
getFontXD
(
46
),
fontWeight
:
'bold'
,
},
});
});
export
default
NotificaitonView
;
export
default
NotificaitonView
;
src/Screens/Notification/Notification.js
View file @
b20a248d
...
@@ -24,7 +24,6 @@ const Notifcation = (props) => {
...
@@ -24,7 +24,6 @@ const Notifcation = (props) => {
page_index
:
1
,
page_index
:
1
,
type
:
fillter
,
type
:
fillter
,
});
});
console
.
log
(
res
.
data
);
setisRefresh
(
false
);
setisRefresh
(
false
);
if
((
res
.
data
.
code
=
200
&&
res
.
data
.
data
))
{
if
((
res
.
data
.
code
=
200
&&
res
.
data
.
data
))
{
setData
(
res
.
data
.
data
);
setData
(
res
.
data
.
data
);
...
...
src/assets/images.js
View file @
b20a248d
...
@@ -63,6 +63,7 @@ const images = {
...
@@ -63,6 +63,7 @@ const images = {
iconCheck
:
require
(
'./images/iconCheck.png'
),
iconCheck
:
require
(
'./images/iconCheck.png'
),
bgmedia
:
require
(
'./images/bgmedia.jpeg'
),
bgmedia
:
require
(
'./images/bgmedia.jpeg'
),
bgLogin
:
require
(
'./images/bgLogin.png'
),
bgLogin
:
require
(
'./images/bgLogin.png'
),
iconPaper
:
require
(
'./images/iconPaper.png'
),
};
};
export
default
images
;
export
default
images
;
src/assets/images/iconPaper.png
0 → 100644
View file @
b20a248d
902 Bytes
src/components/Header/Drawer.js
View file @
b20a248d
...
@@ -14,6 +14,7 @@ import {
...
@@ -14,6 +14,7 @@ import {
AUTHEN
,
AUTHEN
,
PROFILE
,
PROFILE
,
CONTRACT
,
CONTRACT
,
LEGALDOCUMENT
,
}
from
'../../routers/ScreenNames'
;
}
from
'../../routers/ScreenNames'
;
import
{
useNavigation
}
from
'@react-navigation/native'
;
import
{
useNavigation
}
from
'@react-navigation/native'
;
import
{
connect
}
from
'react-redux'
;
import
{
connect
}
from
'react-redux'
;
...
@@ -51,6 +52,12 @@ const menus = [
...
@@ -51,6 +52,12 @@ const menus = [
screen
:
FEEDBACK
,
screen
:
FEEDBACK
,
},
},
{
{
id
:
'7'
,
title
:
'Giấy tờ pháp lý'
,
icon
:
R
.
images
.
iconPaper
,
screen
:
LEGALDOCUMENT
,
},
{
id
:
'5'
,
id
:
'5'
,
title
:
'Cài đặt'
,
title
:
'Cài đặt'
,
icon
:
R
.
images
.
iconSetting
,
icon
:
R
.
images
.
iconSetting
,
...
...
src/routers/ScreenNames.js
View file @
b20a248d
...
@@ -58,3 +58,5 @@ export const WALLETWITHDRAW = 'WALLETWITHDRAW';
...
@@ -58,3 +58,5 @@ export const WALLETWITHDRAW = 'WALLETWITHDRAW';
export
const
PACKETCQG
=
'PACKETCQG'
;
export
const
PACKETCQG
=
'PACKETCQG'
;
export
const
MEDIADETAIL
=
'MEDIADETAIL'
;
export
const
MEDIADETAIL
=
'MEDIADETAIL'
;
export
const
METHODPAYDETAIL
=
'METHODPAYDETAIL'
;
export
const
METHODPAYDETAIL
=
'METHODPAYDETAIL'
;
export
const
LEGALDOCUMENT
=
'LEGALDOCUMENT'
;
src/routers/StackNavigation.js
View file @
b20a248d
...
@@ -39,6 +39,7 @@ import WalletWithdraw from '../Screens/Action/Wallet/WalletWithdraw';
...
@@ -39,6 +39,7 @@ import WalletWithdraw from '../Screens/Action/Wallet/WalletWithdraw';
import
PacketCQG
from
'../Screens/Account/PacrtCQG/PacketCQG'
;
import
PacketCQG
from
'../Screens/Account/PacrtCQG/PacketCQG'
;
import
MediaDetail
from
'../Screens/NewFeed/Media/MediaDetail'
;
import
MediaDetail
from
'../Screens/NewFeed/Media/MediaDetail'
;
import
MethodPayDetail
from
'../Screens/MethodPay/MethodPayDetail'
;
import
MethodPayDetail
from
'../Screens/MethodPay/MethodPayDetail'
;
import
LegaDocument
from
'../Screens/LegalDocument/LegalDocument'
;
import
*
as
ScreenName
from
'./ScreenNames'
;
import
*
as
ScreenName
from
'./ScreenNames'
;
...
@@ -57,6 +58,7 @@ function MyStack(props) {
...
@@ -57,6 +58,7 @@ function MyStack(props) {
headerMode
=
{
'none'
}
headerMode
=
{
'none'
}
initialRouteName
=
{
ScreenName
.
AUTHEN
}
>
initialRouteName
=
{
ScreenName
.
AUTHEN
}
>
<
Stack
.
Screen
name
=
{
ScreenName
.
LOGINSCREEN
}
component
=
{
Login
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
LOGINSCREEN
}
component
=
{
Login
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
LEGALDOCUMENT
}
component
=
{
LegaDocument
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
NOTIFICATION
}
component
=
{
Notification
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
NOTIFICATION
}
component
=
{
Notification
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
MEDIADETAIL
}
component
=
{
MediaDetail
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
MEDIADETAIL
}
component
=
{
MediaDetail
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
TABNAVIGATOR
}
component
=
{
TabNavigator
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
TABNAVIGATOR
}
component
=
{
TabNavigator
}
/
>
...
...
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