收银机程序共用调整

src/pages/AuthPage.js

@@ -36,7 +36,6 @@ class AuthPage extends Component {
           <QRCode
             size={scaleSize(700)}
             logo={require('../assets/logo.png')}
-            logoBackgroundColor="#FC4000"
             backgroundColor="white"
             value={`${config.qrHost}/#/store-auth-${socket}`}
           />

src/pages/CounterMixins.js

@@ -1126,6 +1126,12 @@ const CounterMixins = ComposeComponent => {
       this.submitBarcode(goods.bags[index].barcode);
     };
 
+    talkCall = () => {
+      this.props.dispatch({
+        type: 'agora/talkCall',
+      });
+    };
+
     onCloseLucky = () => {
       this.setState({
         luckyVisible: false,
@@ -1158,23 +1164,36 @@ const CounterMixins = ComposeComponent => {
       if (data.code === 1) {
         Speech.speak(data.msg || '门已经打开，谢谢惠顾');
       } else if (data.code === -2) {
-        Speech.speak(data.msg || '开门失败，请联系客服处理');
+        Speech.speak(data.msg || '开门失败，正在为您呼叫客服');
+        this.talkCall();
+      } else if (data.code === -1) {
+        Speech.speak(data.msg || '开门失败，请扫收银机二维码认证手机号');
+        this.setState({
+          noBuyModal: true,
+        });
+        setTimeout(() => {
+          this.setState({noBuyModal: false});
+        }, 30000);
       } else {
         setTimeout(async () => {
           const {data: dataNext} = await this.props.dispatch({
             type: 'store/open',
             orderId: this.orderId,
+            isScan: !this.state.isInduction,
           });
           if (dataNext.code === 1) {
             Speech.speak(data.msg || '门已经打开，谢谢惠顾');
-          } else {
-            Speech.speak(data.msg || '开门失败，请联系客服处理');
+          } else if (data.code === -1) {
+            Speech.speak(data.msg || '开门失败，请扫收银机二维码认证手机号');
             this.setState({
               noBuyModal: true,
             });
             setTimeout(() => {
               this.setState({noBuyModal: false});
             }, 30000);
+          } else {
+            Speech.speak(data.msg || '开门失败，正在为您呼叫客服');
+            this.talkCall();
           }
         }, 500);
       }

src/pages/VerticalPage.js

@@ -596,7 +596,7 @@ class VerticalPage extends Component {
       contact,
       hintVisible,
       logoVisible,
-      logo,
+      // logo,
       priceVisible,
       stype,
       isCard,
@@ -667,7 +667,8 @@ class VerticalPage extends Component {
               <QRCode
                 logoSize={width > 801 ? 50 : scaleSize(100)}
                 // logoBackgroundColor="#fc4000"
-                logo={logoVisible && require('../assets/logo2.png')}
+                //2023.11.1 logo={logoVisible && require('../assets/logo2.png')}
+                logo={require('../assets/logo2.png')}
                 size={width > 801 ? 200 : scaleSize(400)}
                 value={`${qrHost || login}/#/store-leave-g${this.storeKey}`}
               />
@@ -732,15 +733,19 @@ class VerticalPage extends Component {
           />
           <View style={styles.header}>
             <View style={styles.left}>
-              {logoVisible &&
-                (logo ? (
-                  <Image style={styles.logo} source={{uri: logo}} />
-                ) : (
+              {/*2023.11.1{logoVisible &&*/}
+              {/*  (logo ? (*/}
+              {/*    <Image style={styles.logo} source={{uri: logo}} />*/}
+              {/*  ) : (*/}
+              {/*    <Image*/}
+              {/*      style={styles.logo}*/}
+              {/*      source={require('../assets/Vertical/logo.png')}*/}
+              {/*    />*/}
+              {/*  ))}*/}
               <Image
                 style={styles.logo}
                 source={require('../assets/Vertical/logo.png')}
               />
-                ))}
               <Image style={styles.counterText} source={counterText} />
               <Image source={img24h} />
             </View>
@@ -1110,7 +1115,7 @@ class VerticalPage extends Component {
                     </View>
                     <View style={styles.paymentRightCode}>
                       <QRCode
-                        logoSize={width > 801 ? 50 : scaleSize(60)}
+                        logoSize={width > 801 ? 60 : scaleSize(75)}
                         // logoBackgroundColor="#fc4000"
                         logo={logoVisible && require('../assets/logo2.png')}
                         size={width > 801 ? 200 : scaleSize(250)}
@@ -1317,11 +1322,12 @@ const styles = {
   },
   left: {
     flexDirection: 'row',
+    alignItems: 'center',
     width: width > 801 ? '60%' : '55%',
   },
   logo: {
-    width: width > 801 ? 100 : scaleSize(75),
-    height: width > 801 ? 100 : scaleSize(75),
+    width: width > 801 ? 135 : scaleSize(100),
+    height: width > 801 ? 135 : scaleSize(100),
   },
   counterText: {
     marginLeft: width > 801 ? 40 : scaleSize(22),