Commit 5b41fa8f by Giang Tran

merge code

parents 4bd6e25d 63980c0c
......@@ -35,7 +35,9 @@ const Profile = (props) => {
return (
<View style={styles.container}>
{props.user.status == 6 || props.user.status == 7 ? (
{props.user.status == 6 ||
props.user.status == 7 ||
props.user.status == 8 ? (
<View>
<View style={styles.item}>
<AppText i18nKey={'ContactCode'} style={styles.txtTitle}></AppText>
......@@ -53,7 +55,7 @@ const Profile = (props) => {
style={styles.txtTitle}></AppText>
<Text style={styles.txtBig}>{props.user.cqg_account}</Text>
</View>
{props.user.status == 6 ? (
<View
style={{
flexDirection: 'row',
......@@ -61,13 +63,6 @@ const Profile = (props) => {
justifyContent: 'space-between',
marginTop: 50,
}}>
{props.user.status == 7 ? (
<View style={styles.btnLeft}>
<AppText
i18nKey={'WaitUpdateCQG'}
style={styles.txtBtn}></AppText>
</View>
) : (
<TouchableOpacity
onPress={() => navigation.navigate(PACKETCQG)}
style={styles.btnLeft}>
......@@ -75,11 +70,13 @@ const Profile = (props) => {
i18nKey={'UpdatePacket'}
style={styles.txtBtn}></AppText>
</TouchableOpacity>
)}
<TouchableOpacity onPress={onClickCLose} style={styles.btnRight}>
<AppText i18nKey={'CloseAccount'} style={styles.txtBtn}></AppText>
<AppText
i18nKey={'CloseAccount'}
style={styles.txtBtn}></AppText>
</TouchableOpacity>
</View>
) : null}
</View>
) : (
<View style={{justifyContent: 'center', alignItems: 'center', flex: 1}}>
......
......@@ -115,10 +115,7 @@ const GeneralInfor = (props) => {
<AppText i18nKey={'Status'} style={styles.txtTitle}></AppText>
</View>
<View style={styles.wrapRight}>
<Text style={styles.txtTitle}>
{' '}
{renderStatus(props.user.status)}
</Text>
<Text style={styles.txtTitle}>{props.user.status_name}</Text>
</View>
</View>
......
export const root = 'http://services.dcvinvest.com/';
export const root = 'http://api.dcvinvest.com/';
export default {
urllogin: root + 'api/auth/customer-login',
urlRegistor: root + 'api/auth/customer-register',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment