更改了扫码进出门的页面

src/pages/FacePage.js

@@ -34,9 +34,11 @@ class FacePage extends Component {
     tip: '',
     tipsModal: false,
     faceType: 'wxpay',
-    sleep: true,
+    sleep: false,
     loadingModal: false,
     qrCode: '',
+    goTipsModal: false,
+    type: '',
   };
 
   async componentWillMount() {
@@ -213,6 +215,9 @@ class FacePage extends Component {
   };
 
   handleDoorLogin = async ret => {
+    this.setState({
+      type: ret.type,
+    });
     if (ret) {
       if (ret.code < 0 || ret.code === 401) {
         // 未授权，提示用户扫码验证
@@ -265,13 +270,14 @@ class FacePage extends Component {
     }
   };
 
-  setQrcode = ({action, tip}) => {
+  setQrcode = ({action, tip, qrcode}) => {
     const state = {
       qrCode: `${qrHost}/#/store-${action}-j${this.storeKey}`,
     };
     if (tip) {
       state.tip = tip;
-      state.tipsModal = true;
+      if (qrcode) state.goTipsModal = true;
+      else state.tipsModal = true;
       state.loadingModal = false;
     }
     this.setState(state);
@@ -318,7 +324,7 @@ class FacePage extends Component {
         // res = (await WxFacepay.faceinfo(params)) || {};
         // 返回错误出现二维码扫码
         Speech.speak('请扫码开门');
-        this.setQrcode({action: this.action, tip: '请扫码开门'});
+        this.setQrcode({action: this.action, tip: '请扫码开门', qrcode: true});
       }
       if (window.socket) {
         // 返回结果，立即重新连接socket
@@ -370,7 +376,7 @@ class FacePage extends Component {
       if (res.code !== '1000') {
         Toast.show(res.msg);
         Speech.speak('请扫码开门');
-        this.setQrcode({action: this.action, tip: '请扫码开门'});
+        this.setQrcode({action: this.action, tip: '请扫码开门', qrcode: true});
         return;
       }
       this.loading(true);
@@ -391,6 +397,10 @@ class FacePage extends Component {
 
   // 语音通话请求
   onCall = async () => {
+    await this.setState({
+      tipsModal: false,
+      type: '',
+    });
     const {talkCall} = this.state;
     if (talkCall === 2) {
       Speech.speak('正在接通中请稍候');
@@ -438,13 +448,18 @@ class FacePage extends Component {
     this.setState({sleep: false});
     clearTimeout(this.wakeUpTimeout);
     this.wakeUpTimeout = setTimeout(() => {
-      this.setState({sleep: true});
+      this.setState({sleep: true, tipsModal: false});
     }, 18888);
   };
 
-  closeTips = async () => {
-    await this.setState({tipsModal: false});
-    await this.face();
+  goTips = async () => {
+    Speech.speak('请扫码确认');
+    await this.setState({tipsModal: false, goTipsModal: true, type: ''});
+  };
+
+  goToo = async () => {
+    await this.setState({tipsModal: false, goTipsModal: false, type: ''});
+    window.socket.emit('jokerOpen', true, 'enter');
   };
 
   render() {
@@ -464,7 +479,21 @@ class FacePage extends Component {
       faceType,
       loadingModal,
       qrCode,
+      goTipsModal,
+      type,
     } = this.state;
+    let flag = '';
+    let flags = '';
+    if (type === 'over') {
+      flags = '回店付款';
+      flag = '我已付款';
+    } else if (type === 'loss') {
+      flag = '确认出店';
+      flags = '回到店里';
+    } else {
+      flags = '回到店里';
+      flag = '呼叫客服';
+    }
     let {dispatch} = this.props;
     if (faceType === 'alipay') {
       styles.header = {...styles.header, backgroundColor: '#1b7dc7'};
@@ -511,14 +540,24 @@ class FacePage extends Component {
           transparent
           title={'开门失败'}
           tip={tip}
-          qrCode={qrCode}
-          leftText={'呼叫客服'}
-          rightText={'重新识别'}
-          leftTouch={this.onCall}
-          rightTouch={this.closeTips}
+          leftText={flags}
+          rightText={flag}
+          leftTouch={this.goToo}
+          rightTouch={
+            type === 'over' || type === 'loss' ? this.goTips : this.onCall
+          }
           onMaskPress={() => this.setState({tipsModal: false})}
           faceType={faceType}
         />
+        <TipsModal
+          visible={goTipsModal}
+          transparent
+          title={'扫码开门'}
+          qrCode={qrCode}
+          tip="请扫码确认"
+          onMaskPress={() => this.setState({goTipsModal: false})}
+          faceType={faceType}
+        />
         <LoadingModal transparent visible={loadingModal} />
         <View style={styles.header}>
           <View style={styles.title}>