优化弹窗和图标

android @ f1af412d

-Subproject commit 1cc32ac808e8c94bc9b3f69d179e50ad7c77297e
+Subproject commit f1af412d416703975a237f1787c7047c62cdafcd

package.json

@@ -25,7 +25,7 @@
     "react-native-qrcode-svg": "6.0.6",
     "react-native-svg": "12.1.0",
     "react-native-swiper": "1.6.0",
-    "react-native-vector-icons": "4.5.0",
+    "react-native-vector-icons": "6.6.0",
     "react-redux": "7.2.0",
     "redux": "4.0.5",
     "socket.io-client": "2.0.4",

src/components/NumberModal.js

 import React from 'react';
 import {View, Text} from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
+import MIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import {colors, font} from '../utils/common';
 import Touch from './Touch';
 import Modal from './Modal';
@@ -35,7 +36,7 @@ export default class KeyboardModal extends React.Component {
       let unit;
       if (i === 10 && !dot) {
         unit = (
-          <Icon style={styles.keyUnit} name="ios-backspace-outline" size={60} />
+          <MIcon style={styles.keyUnit} name="backspace-outline" size={60} />
         );
       } else if (i === 10 && dot) {
         unit = <Text style={styles.keyUnit}>.</Text>;
@@ -100,6 +101,12 @@ export default class KeyboardModal extends React.Component {
         maskClosable
         onClose={this.handleClose}
         title={title}>
+        <Touch
+          style={{position: 'absolute', top: -65, right: 20}}
+          onPress={this.handleClose}
+          feedback={false}>
+          <Icon size={50} name="ios-close-circle-outline" />
+        </Touch>
         <View
           style={{
             width: 550,
@@ -107,12 +114,6 @@ export default class KeyboardModal extends React.Component {
             borderTopWidth: 1,
             paddingVertical: 20,
           }}>
-          <Touch
-            style={{position: 'absolute', top: -70, right: -5}}
-            onPress={this.handleClose}
-            feedback={false}>
-            <Icon size={50} name="ios-close-circle-outline" />
-          </Touch>
           <View
             style={{
               width: 550,

src/components/PhoneModal.js

 import React, {Component} from 'react';
 import {Modal, View, Text, Image, TextInput} from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
+import MIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import ModalStyles from './Modal/styles';
 import {colors, font} from '../utils/common';
 import Touch from './Touch';
@@ -134,9 +135,9 @@ class PhoneModal extends Component {
                 <Touch
                   style={styles.keyTouchClose}
                   onPress={() => this.pressKey(11)}>
-                  <Icon
+                  <MIcon
                     style={styles.keyUnit}
-                    name="ios-backspace-outline"
+                    name="backspace-outline"
                     size={60}
                   />
                 </Touch>

src/components/VerifyCodeModal.js

 import React, {Component} from 'react';
 import {Modal, View, Text, Image} from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
+import MIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import ModalStyles from './Modal/styles';
 import {colors, font} from '../utils/common';
 import Touch from './Touch';
@@ -122,9 +123,9 @@ class VerifyCodeModal extends Component {
                 <Touch
                   style={styles.keyTouchClose}
                   onPress={() => this.pressKey(11)}>
-                  <Icon
+                  <MIcon
                     style={styles.keyUnit}
-                    name="ios-backspace-outline"
+                    name="backspace-outline"
                     size={60}
                   />
                 </Touch>