Commit e0fb59c8 authored by Trisno's avatar Trisno

update 134

parent 2b974709
{ {
"expo": { "expo": {
"extra" : { "extra" : {
"buildNumber" : "132", "buildNumber" : "134",
"remarks": "" "remarks": ""
}, },
......
...@@ -47,6 +47,16 @@ class Login extends React.Component { ...@@ -47,6 +47,16 @@ class Login extends React.Component {
} }
} }
setBaseUrl() {
if (this.state.clickSettings == 3) {
this.props.navigation.navigate('Setting')
this.setState({ clickSettings: 0 })
} else {
let new_count = this.state.clickSettings
this.setState({ clickSettings: new_count + 1 })
}
}
privacyPolicy() { privacyPolicy() {
// if (this.state.clickSettings == 3) { // if (this.state.clickSettings == 3) {
// this.props.navigation.navigate('Setting') // this.props.navigation.navigate('Setting')
...@@ -93,7 +103,7 @@ class Login extends React.Component { ...@@ -93,7 +103,7 @@ class Login extends React.Component {
async handleLoggin() { async handleLoggin() {
if (/\s/.test(this.state.email)) { if (/\s/.test(this.state.email)) {
Alert.alert('',i18n.t('alertSpaceCharEmail')) Alert.alert('', i18n.t('alertSpaceCharEmail'))
} else { } else {
this.setState({ this.setState({
spinner: true, spinner: true,
...@@ -280,8 +290,9 @@ class Login extends React.Component { ...@@ -280,8 +290,9 @@ class Login extends React.Component {
<StatusBar hidden={true} /> <StatusBar hidden={true} />
<ImageBackground source={require('../assets/images/loging-background.png')} style={{ width: '100%', height: '100%' }}> <ImageBackground source={require('../assets/images/loging-background.png')} style={{ width: '100%', height: '100%' }}>
<View style={styles.logo}> <View style={styles.logo}>
<Image resizeMode="cover" source={require('../assets/images/excelso-log.png')} style={styles.imageslogo}></Image> <Image resizeMode="cover" source={require('../assets/images/excelso-log.png')} style={styles.imageslogo}></Image>
<TouchableWithoutFeedback style={{marginHorizontal:50, paddingVertical:20}} onPress={() => this.setBaseUrl()}/>
</View> </View>
<View style={styles.v_form}> <View style={styles.v_form}>
<View style={{ flex: 1, marginRight: 30, marginLeft: 30, justifyContent: 'center' }} removeClippedSubviews={false} > <View style={{ flex: 1, marginRight: 30, marginLeft: 30, justifyContent: 'center' }} removeClippedSubviews={false} >
......
...@@ -51,7 +51,7 @@ class RewardsList extends React.Component { ...@@ -51,7 +51,7 @@ class RewardsList extends React.Component {
}) })
Axios.post(this.props.BASE_URL+'crm/v2/reward/get_list', params).then(res => { Axios.post(this.props.BASE_URL+'crm/v2/reward/get_list', params).then(res => {
let data = res.data.rewards let data = res.data.rewards
// console.log(data) console.log(data)
data.map((item, key) => { data.map((item, key) => {
// console.log(item.expire_time) // console.log(item.expire_time)
item.expire_time = moment(item.expire_time).format("DD MMMM YYYY") item.expire_time = moment(item.expire_time).format("DD MMMM YYYY")
......
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