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
0b6c1cb8
Commit
0b6c1cb8
authored
May 10, 2021
by
Giang Tran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reject verify
parent
282810a4
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
87 additions
and
19 deletions
+87
-19
Functions.js
src/Config/Functions.js
+11
-0
AccountVerificationView.js
src/Screens/AccountVerification/AccountVerificationView.js
+10
-2
GeneralInfor.js
src/Screens/AccountVerification/Tab/GeneralInfor.js
+25
-8
Profile.js
src/Screens/AccountVerification/Tab/Profile.js
+7
-5
HeaderHome.js
src/components/Header/HeaderHome.js
+24
-1
PickerImgUni.js
src/components/Picker/PickerImgUni.js
+2
-2
en.js
src/helper/i18/locales/en.js
+2
-0
vn.js
src/helper/i18/locales/vn.js
+2
-0
TabNavigation.js
src/routers/TabNavigation.js
+4
-1
No files found.
src/Config/Functions.js
View file @
0b6c1cb8
...
@@ -62,6 +62,17 @@ export const renderStatus = (status) => {
...
@@ -62,6 +62,17 @@ export const renderStatus = (status) => {
}}
}}
/
>
/
>
);
);
case
4
:
return
(
<
AppText
i18nKey
=
{
'RejectVerify'
}
style
=
{{
color
:
'#F99D1D'
,
fontSize
:
getFontXD
(
42
),
fontWeight
:
'bold'
,
}}
/
>
);
case
3
:
case
3
:
return
(
return
(
<
AppText
<
AppText
...
...
src/Screens/AccountVerification/AccountVerificationView.js
View file @
0b6c1cb8
...
@@ -33,12 +33,20 @@ const AccountVerificationView = (props) => {
...
@@ -33,12 +33,20 @@ const AccountVerificationView = (props) => {
}}
>
}}
>
<
Tab
.
Screen
<
Tab
.
Screen
name
=
"GeneralInfor"
name
=
"GeneralInfor"
component
=
{
props
.
user
.
status
==
1
?
GeneralInfor
:
GeneralView
}
component
=
{
props
.
user
.
status
==
1
||
props
.
user
.
status
==
4
?
GeneralInfor
:
GeneralView
}
options
=
{{
tabBarLabel
:
I18n
.
t
(
'GeneralInformation'
)}}
options
=
{{
tabBarLabel
:
I18n
.
t
(
'GeneralInformation'
)}}
/
>
/
>
<
Tab
.
Screen
<
Tab
.
Screen
name
=
"Profile"
name
=
"Profile"
component
=
{
props
.
user
.
status
==
1
?
Profile
:
ProfileView
}
component
=
{
props
.
user
.
status
==
1
||
props
.
user
.
status
==
4
?
Profile
:
ProfileView
}
options
=
{{
tabBarLabel
:
I18n
.
t
(
'Profile'
)}}
options
=
{{
tabBarLabel
:
I18n
.
t
(
'Profile'
)}}
/
>
/
>
<
/Tab.Navigator
>
<
/Tab.Navigator
>
...
...
src/Screens/AccountVerification/Tab/GeneralInfor.js
View file @
0b6c1cb8
...
@@ -13,7 +13,7 @@ import {
...
@@ -13,7 +13,7 @@ import {
Keyboard
,
Keyboard
,
}
from
'react-native'
;
}
from
'react-native'
;
import
R
from
'../../../assets/R'
;
import
R
from
'../../../assets/R'
;
import
moment
from
'moment
'
;
import
{
connect
}
from
'react-redux
'
;
import
TextField
from
'../../../components/Input/TextField'
;
import
TextField
from
'../../../components/Input/TextField'
;
import
TextMulti
from
'../../../components/Input/TextMulti'
;
import
TextMulti
from
'../../../components/Input/TextMulti'
;
...
@@ -24,13 +24,21 @@ import I18n from '../../../helper/i18/i18n';
...
@@ -24,13 +24,21 @@ import I18n from '../../../helper/i18/i18n';
import
{
checkFormatArray
,
convertTime
}
from
'../../../Config/Functions'
;
import
{
checkFormatArray
,
convertTime
}
from
'../../../Config/Functions'
;
const
GeneralInfor
=
(
props
)
=>
{
const
GeneralInfor
=
(
props
)
=>
{
const
[
lastName
,
setLastName
]
=
useState
(
''
);
const
[
lastName
,
setLastName
]
=
useState
(
props
.
user
.
l_name
);
const
[
firstName
,
setFirstName
]
=
useState
(
''
);
const
[
firstName
,
setFirstName
]
=
useState
(
props
.
user
.
f_name
);
const
[
phone
,
setPhone
]
=
useState
(
''
);
const
[
phone
,
setPhone
]
=
useState
(
props
.
user
.
phone
);
const
[
address
,
setAdress
]
=
useState
(
''
);
const
[
address
,
setAdress
]
=
useState
(
props
.
user
.
address
);
const
[
birth
,
setBirth
]
=
useState
(
new
Date
());
const
[
birth
,
setBirth
]
=
useState
(
new
Date
(
props
.
user
.
birthday
));
console
.
log
(
'User'
,
props
.
user
);
const
onNextPress
=
()
=>
{
const
onNextPress
=
()
=>
{
const
titles
=
[
I18n
.
t
(
'FirstLastName'
).
toLowerCase
(),
I18n
.
t
(
'Name'
).
toLowerCase
(),
I18n
.
t
(
'PhoneNumber'
).
toLowerCase
(),
I18n
.
t
(
'Address'
).
toLowerCase
()];
const
titles
=
[
I18n
.
t
(
'FirstLastName'
).
toLowerCase
(),
I18n
.
t
(
'Name'
).
toLowerCase
(),
I18n
.
t
(
'PhoneNumber'
).
toLowerCase
(),
I18n
.
t
(
'Address'
).
toLowerCase
(),
];
const
index
=
checkFormatArray
([
lastName
,
firstName
,
phone
,
address
]);
const
index
=
checkFormatArray
([
lastName
,
firstName
,
phone
,
address
]);
if
(
index
===
true
)
{
if
(
index
===
true
)
{
props
.
navigation
.
navigate
(
'Profile'
,
{
props
.
navigation
.
navigate
(
'Profile'
,
{
...
@@ -59,6 +67,7 @@ const GeneralInfor = (props) => {
...
@@ -59,6 +67,7 @@ const GeneralInfor = (props) => {
<
View
style
=
{{
flexDirection
:
'row'
}}
>
<
View
style
=
{{
flexDirection
:
'row'
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
TextField
<
TextField
value
=
{
lastName
}
title
=
{
I18n
.
t
(
'FirstLastName'
)}
title
=
{
I18n
.
t
(
'FirstLastName'
)}
onChangeText
=
{(
val
)
=>
setLastName
(
val
)}
onChangeText
=
{(
val
)
=>
setLastName
(
val
)}
/
>
/
>
...
@@ -66,12 +75,14 @@ const GeneralInfor = (props) => {
...
@@ -66,12 +75,14 @@ const GeneralInfor = (props) => {
<
View
style
=
{{
width
:
20
}}
/
>
<
View
style
=
{{
width
:
20
}}
/
>
<
View
style
=
{{
flex
:
1
}}
>
<
View
style
=
{{
flex
:
1
}}
>
<
TextField
<
TextField
value
=
{
firstName
}
title
=
{
I18n
.
t
(
'Name'
)}
title
=
{
I18n
.
t
(
'Name'
)}
onChangeText
=
{(
val
)
=>
setFirstName
(
val
)}
onChangeText
=
{(
val
)
=>
setFirstName
(
val
)}
/
>
/
>
<
/View
>
<
/View
>
<
/View
>
<
/View
>
<
TextField
<
TextField
value
=
{
phone
}
isNumber
=
{
true
}
isNumber
=
{
true
}
title
=
{
I18n
.
t
(
'PhoneNumber'
)}
title
=
{
I18n
.
t
(
'PhoneNumber'
)}
onChangeText
=
{(
val
)
=>
setPhone
(
val
)}
onChangeText
=
{(
val
)
=>
setPhone
(
val
)}
...
@@ -85,6 +96,7 @@ const GeneralInfor = (props) => {
...
@@ -85,6 +96,7 @@ const GeneralInfor = (props) => {
/
>
/
>
<
TextMulti
<
TextMulti
value
=
{
address
}
title
=
{
I18n
.
t
(
'Address'
)}
title
=
{
I18n
.
t
(
'Address'
)}
onChangeText
=
{(
val
)
=>
setAdress
(
val
)}
onChangeText
=
{(
val
)
=>
setAdress
(
val
)}
/
>
/
>
...
@@ -123,4 +135,9 @@ const styles = StyleSheet.create({
...
@@ -123,4 +135,9 @@ const styles = StyleSheet.create({
},
},
});
});
export
default
GeneralInfor
;
const
mapStateToProps
=
(
state
)
=>
{
return
{
user
:
state
.
userReducer
,
};
};
export
default
connect
(
mapStateToProps
,
{})(
GeneralInfor
);
src/Screens/AccountVerification/Tab/Profile.js
View file @
0b6c1cb8
...
@@ -48,11 +48,10 @@ const dataType = [
...
@@ -48,11 +48,10 @@ const dataType = [
];
];
const
Profile
=
(
props
)
=>
{
const
Profile
=
(
props
)
=>
{
const
[
urlFont
,
setUrlFont
]
=
useState
(
''
);
const
[
urlFont
,
setUrlFont
]
=
useState
(
props
.
user
.
identity_before
);
const
[
urlBack
,
setUrlBack
]
=
useState
(
''
);
const
[
urlBack
,
setUrlBack
]
=
useState
(
props
.
user
.
identity_after
);
const
[
urlSign
,
setUrlSign
]
=
useState
(
''
);
const
[
urlSign
,
setUrlSign
]
=
useState
(
props
.
user
.
sign_img
);
// const [cmnd, setCMND] = useState('');
// const [date_range, setDate_range] = useState(new Date());
const
[
type
,
setType
]
=
useState
();
const
[
type
,
setType
]
=
useState
();
const
createFormData
=
(
identity_after
,
identity_before
,
sign_img
,
body
)
=>
{
const
createFormData
=
(
identity_after
,
identity_before
,
sign_img
,
body
)
=>
{
...
@@ -172,14 +171,17 @@ const Profile = (props) => {
...
@@ -172,14 +171,17 @@ const Profile = (props) => {
flex
:
1
,
flex
:
1
,
}}
>
}}
>
<
PickerImgUni
<
PickerImgUni
uriImage
=
{
urlFont
}
onSelectImg
=
{(
path
)
=>
setUrlFont
(
path
)}
onSelectImg
=
{(
path
)
=>
setUrlFont
(
path
)}
title
=
{
I18n
.
t
(
'IdentityCardFrontPhoto'
)}
title
=
{
I18n
.
t
(
'IdentityCardFrontPhoto'
)}
/
>
/
>
<
PickerImgUni
<
PickerImgUni
uriImage
=
{
urlBack
}
onSelectImg
=
{(
path
)
=>
setUrlBack
(
path
)}
onSelectImg
=
{(
path
)
=>
setUrlBack
(
path
)}
title
=
{
I18n
.
t
(
'IdentityCardBackPhoto'
)}
title
=
{
I18n
.
t
(
'IdentityCardBackPhoto'
)}
/
>
/
>
<
PickerImgUni
<
PickerImgUni
uriImage
=
{
urlSign
}
onSelectImg
=
{(
path
)
=>
setUrlSign
(
path
)}
onSelectImg
=
{(
path
)
=>
setUrlSign
(
path
)}
title
=
{
I18n
.
t
(
'SignPhoto'
)}
title
=
{
I18n
.
t
(
'SignPhoto'
)}
/
>
/
>
...
...
src/components/Header/HeaderHome.js
View file @
0b6c1cb8
...
@@ -36,6 +36,29 @@ import {
...
@@ -36,6 +36,29 @@ import {
import
PickerAvtart
from
'../../components/Picker/PickerAvatart'
;
import
PickerAvtart
from
'../../components/Picker/PickerAvatart'
;
const
renderWallet
=
(
status
,
current_money
,
current_cqg_money
,
contract
)
=>
{
const
renderWallet
=
(
status
,
current_money
,
current_cqg_money
,
contract
)
=>
{
const
navigate
=
useNavigation
();
const
navigate
=
useNavigation
();
if
(
status
==
4
)
return
(
<
View
style
=
{{
flex
:
1
,
justifyContent
:
'center'
,
alignItems
:
'center'
}}
>
<
TouchableOpacity
disabled
=
{
status
==
2
?
true
:
false
}
onPress
=
{()
=>
navigate
.
navigate
(
AccountVerification
)}
>
<
ImageBackground
imageStyle
=
{{
borderRadius
:
10
}}
style
=
{{
width
:
320
,
height
:
60
,
borderRadius
:
10
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
}}
source
=
{
R
.
images
.
iconBtnGreen
}
>
<
AppText
i18nKey
=
{
'ReVerify'
}
style
=
{{
fontSize
:
getFontXD
(
52
),
color
:
'white'
}}
><
/AppText
>
<
/ImageBackground
>
<
/TouchableOpacity
>
<
/View
>
);
if
(
status
==
6
)
if
(
status
==
6
)
return
(
return
(
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
}}
>
<
View
style
=
{{
flex
:
1
,
flexDirection
:
'row'
}}
>
...
@@ -185,7 +208,7 @@ const renderActions = (onClickDetail) => {
...
@@ -185,7 +208,7 @@ const renderActions = (onClickDetail) => {
const
HeaderHome
=
(
props
)
=>
{
const
HeaderHome
=
(
props
)
=>
{
const
navigate
=
useNavigation
();
const
navigate
=
useNavigation
();
console
.
log
(
'User--'
,
props
.
user
.
status
);
const
[
detail
,
setDetail
]
=
useState
(
false
);
const
[
detail
,
setDetail
]
=
useState
(
false
);
const
onClickDetail
=
()
=>
{
const
onClickDetail
=
()
=>
{
...
...
src/components/Picker/PickerImgUni.js
View file @
0b6c1cb8
...
@@ -32,10 +32,10 @@ const options = {
...
@@ -32,10 +32,10 @@ const options = {
};
};
const
PickerImgUni
=
(
props
)
=>
{
const
PickerImgUni
=
(
props
)
=>
{
const
{
title
,
height
,
width
,
onSelectImg
}
=
props
;
const
{
title
,
height
,
width
,
onSelectImg
,
uriImage
}
=
props
;
const
[
isModalVisible
,
setModalVisible
]
=
useState
(
false
);
const
[
isModalVisible
,
setModalVisible
]
=
useState
(
false
);
const
[
urlImg
,
setUrlImg
]
=
useState
(
''
);
const
[
urlImg
,
setUrlImg
]
=
useState
(
uriImage
);
// const [imgPicker, setImgPicker] = useState('');
// const [imgPicker, setImgPicker] = useState('');
const
checkPermissionAndroid
=
()
=>
{
const
checkPermissionAndroid
=
()
=>
{
...
...
src/helper/i18/locales/en.js
View file @
0b6c1cb8
...
@@ -227,4 +227,6 @@ export default {
...
@@ -227,4 +227,6 @@ export default {
WorkingTime
:
'Working time:'
,
WorkingTime
:
'Working time:'
,
ContentRequire
:
'Content require:'
,
ContentRequire
:
'Content require:'
,
FeedBackDCV
:
'Feedback for DCV Invest'
,
FeedBackDCV
:
'Feedback for DCV Invest'
,
ReVerify
:
'Re-Verify'
,
RejectVerify
:
'Reject verify'
,
};
};
src/helper/i18/locales/vn.js
View file @
0b6c1cb8
...
@@ -229,4 +229,6 @@ export default {
...
@@ -229,4 +229,6 @@ export default {
WorkingTime
:
'Thời gian làm việc:'
,
WorkingTime
:
'Thời gian làm việc:'
,
ContentRequire
:
'Nội dung yêu cầu:'
,
ContentRequire
:
'Nội dung yêu cầu:'
,
FeedBackDCV
:
'Đánh giá dịch vụ của DCV Invest'
,
FeedBackDCV
:
'Đánh giá dịch vụ của DCV Invest'
,
ReVerify
:
'Xác minh lại'
,
RejectVerify
:
'Từ chối xác minh'
,
};
};
src/routers/TabNavigation.js
View file @
0b6c1cb8
...
@@ -112,7 +112,10 @@ const TabNavigator = (props) => {
...
@@ -112,7 +112,10 @@ const TabNavigator = (props) => {
options
=
{{
options
=
{{
tabBarLabel
:
I18n
.
t
(
'Tradding'
),
tabBarLabel
:
I18n
.
t
(
'Tradding'
),
tabBarIcon
:
({
color
,
size
})
=>
(
tabBarIcon
:
({
color
,
size
})
=>
(
<
Image
source
=
{
R
.
images
.
iconTransaction2
}
style
=
{{
width
:
size
,
height
:
size
,
tintColor
:
color
}}
/
>
<
Image
source
=
{
R
.
images
.
iconTransaction2
}
style
=
{{
width
:
size
,
height
:
size
,
tintColor
:
color
}}
/
>
),
),
}}
}}
/
>
/
>
...
...
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