确认出门无码bug

src/components/TipsModal.js

@@ -39,6 +39,10 @@ class TipsModal extends Component {
     if (contentText === '') {
       flag = false;
     }
+    let flags = true;
+    if (!leftText && !contentText && !rightText) {
+      flags = false;
+    }
     if (faceType === 'alipay') {
       styles.header = {...styles.header, backgroundColor: '#1b7dc7'};
       styles.left = {
@@ -94,7 +98,7 @@ class TipsModal extends Component {
                 {tip}
               </Text>
             </View>
-            {!qrCode && (
+            {!qrCode && flags && (
               <View style={styles.footer}>
                 <Touch
                   style={flag ? styles.left : styles.lefts}

src/pages/FacePage.js

@@ -38,7 +38,7 @@ class FacePage extends Component {
     tip: '',
     tipsModal: false,
     faceType: 'wxpay',
-    sleep: true,
+    sleep: false,
     loadingModal: false,
     qrCode: '',
     goTipsModal: false,
@@ -287,12 +287,14 @@ class FacePage extends Component {
 
   setQrcode = ({action, tip, qrcode}) => {
     const state = {
-      qrCode: `${qrHost}/#/store-${action}-j${this.storeKey}`,
+      qrCode: `${qrHost}/#/store-${action || 'leave'}-j${this.storeKey}`,
     };
     if (tip) {
       state.tip = tip;
-      if (qrcode) state.goTipsModal = true;
-      else state.tipsModal = true;
+      if (qrcode) {
+        state.tipsModal = false;
+        state.goTipsModal = true;
+      } else state.tipsModal = true;
       state.loadingModal = false;
     }
     this.setState(state);
@@ -472,7 +474,7 @@ class FacePage extends Component {
 
   goTips = async () => {
     Speech.speak('请扫码确认');
-    await this.setState({tipsModal: false, goTipsModal: true, type: ''});
+    this.setQrcode({action: this.action, tip: '请扫码开门', qrcode: true});
   };
 
   goToo = async () => {