Skip to content

I
InvestCustomer
Commit 5b41fa8f by Giang Tran
Options

merge code

parents 4bd6e25d 63980c0c
Showing with 20 additions and 26 deletions
src/Screens/Menu/Profile/Tab/CQG.js
...@@ -35,7 +35,9 @@ const Profile = (props) => { ...@@ -35,7 +35,9 @@ const Profile = (props) => {
return ( return (
<View style={styles.container}> <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>
<View style={styles.item}> <View style={styles.item}>
<AppText i18nKey={'ContactCode'} style={styles.txtTitle}></AppText> <AppText i18nKey={'ContactCode'} style={styles.txtTitle}></AppText>
...@@ -53,21 +55,14 @@ const Profile = (props) => { ...@@ -53,21 +55,14 @@ const Profile = (props) => {
style={styles.txtTitle}></AppText> style={styles.txtTitle}></AppText>
<Text style={styles.txtBig}>{props.user.cqg_account}</Text> <Text style={styles.txtBig}>{props.user.cqg_account}</Text>
</View> </View>
{props.user.status == 6 ? (
<View <View
style={{ style={{
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
marginTop: 50, marginTop: 50,
}}> }}>
{props.user.status == 7 ? (
<View style={styles.btnLeft}>
<AppText
i18nKey={'WaitUpdateCQG'}
style={styles.txtBtn}></AppText>
</View>
) : (
<TouchableOpacity <TouchableOpacity
onPress={() => navigation.navigate(PACKETCQG)} onPress={() => navigation.navigate(PACKETCQG)}
style={styles.btnLeft}> style={styles.btnLeft}>
...@@ -75,11 +70,13 @@ const Profile = (props) => { ...@@ -75,11 +70,13 @@ const Profile = (props) => {
i18nKey={'UpdatePacket'} i18nKey={'UpdatePacket'}
style={styles.txtBtn}></AppText> style={styles.txtBtn}></AppText>
</TouchableOpacity> </TouchableOpacity>
)} <TouchableOpacity onPress={onClickCLose} style={styles.btnRight}>
<TouchableOpacity onPress={onClickCLose} style={styles.btnRight}> <AppText
<AppText i18nKey={'CloseAccount'} style={styles.txtBtn}></AppText> i18nKey={'CloseAccount'}
</TouchableOpacity> style={styles.txtBtn}></AppText>
</View> </TouchableOpacity>
</View>
) : null}
</View> </View>
) : ( ) : (
<View style={{justifyContent: 'center', alignItems: 'center', flex: 1}}> <View style={{justifyContent: 'center', alignItems: 'center', flex: 1}}>
......
src/Screens/Menu/Profile/Tab/GeneralInfor.js
...@@ -115,10 +115,7 @@ const GeneralInfor = (props) => { ...@@ -115,10 +115,7 @@ const GeneralInfor = (props) => {
<AppText i18nKey={'Status'} style={styles.txtTitle}></AppText> <AppText i18nKey={'Status'} style={styles.txtTitle}></AppText>
</View> </View>
<View style={styles.wrapRight}> <View style={styles.wrapRight}>
<Text style={styles.txtTitle}> <Text style={styles.txtTitle}>{props.user.status_name}</Text>
{' '}
{renderStatus(props.user.status)}
</Text>
</View> </View>
</View> </View>
......
src/apis/url.js
export const root = 'http://services.dcvinvest.com/'; export const root = 'http://api.dcvinvest.com/';
export default { export default {
urllogin: root + 'api/auth/customer-login', urllogin: root + 'api/auth/customer-login',
urlRegistor: root + 'api/auth/customer-register', 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