Merge remote-tracking branch 'origin/master'

src/components/PhoneModal.js

@@ -5,7 +5,7 @@ import MIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import ModalStyles from './Modal/styles';
 import {colors, font} from '../utils/common';
 import Touch from './Touch';
-import phone from '../assets/Vertical/phone.png';
+import close from '../assets/Vertical/close.png';
 import {setSpText, scaleSize} from '../utils/screen';
 
 const mStyles = {
@@ -100,8 +100,7 @@ class PhoneModal extends Component {
                 <Touch onPress={() => onCall()}>
                   <View style={styles.right}>
                     {/*<Icon name="md-close" color={'#FFFFFF'} size={50} />*/}
-                    <Text style={styles.text}>呼叫客服</Text>
-                    <Image style={styles.phone} source={phone} />
+                    <Image style={styles.close} source={close} />
                   </View>
                 </Touch>
               </View>
@@ -129,7 +128,7 @@ class PhoneModal extends Component {
                 }}>
                 <TextInput
                   style={{
-                    fontSize: setSpText(90),
+                    fontSize: setSpText(70),
                     width: '80%',
                     textAlign: 'center',
                     padding: scaleSize(20),
@@ -251,6 +250,12 @@ const styles = {
     marginRight: scaleSize(10),
     resizeMode: 'contain',
   },
+  close: {
+    width: scaleSize(60),
+    height: scaleSize(60),
+    marginRight: scaleSize(10),
+    resizeMode: 'contain',
+  },
   image: {
     flex: 1,
     flexDirection: 'row',
@@ -379,6 +384,7 @@ const styles = {
   keyUnitClose: {
     fontSize: setSpText(85),
     color: '#FFFFFF',
+    textAlign: 'center',
   },
 };
 

src/components/VerifyCodeModal.js

@@ -5,7 +5,7 @@ import MIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import ModalStyles from './Modal/styles';
 import {colors, font} from '../utils/common';
 import Touch from './Touch';
-import phone from '../assets/Vertical/phone.png';
+import close from '../assets/Vertical/close.png';
 import {setSpText, scaleSize} from '../utils/screen';
 
 const mStyles = {
@@ -109,8 +109,7 @@ class VerifyCodeModal extends Component {
                 <Touch onPress={() => onCall()}>
                   <View style={styles.right}>
                     {/*<Icon name="md-close" color={'#FFFFFF'} size={50} />*/}
-                    <Text style={styles.text}>呼叫客服</Text>
-                    <Image style={styles.phone} source={phone} />
+                    <Image style={styles.phone} source={close} />
                   </View>
                 </Touch>
               </View>
@@ -384,6 +383,7 @@ const styles = {
   keyUnitClose: {
     fontSize: setSpText(85),
     color: '#FFFFFF',
+    textAlign: 'center',
   },
 };
 

src/pages/FacePage.js

@@ -509,14 +509,14 @@ class FacePage extends Component {
         <PhoneModal
           visible={phoneModal}
           transparent
-          onCall={this.onCall}
+          onCall={() => this.setState({phoneModal: false})}
           onSubmit={this.onSubmit}
           faceType={faceType}
         />
         <VerifyCodeModal
           visible={verifyCodeModal}
           transparent
-          onCall={this.onCall}
+          onCall={() => this.setState({verifyCodeModal: false})}
           onSubmit={this.onCodeSubmit}
           faceType={faceType}
         />