Merge remote-tracking branch 'origin/master'

src/components/HomeLayout.js

@@ -28,7 +28,7 @@ class HomeLayout extends Component {
               paddingRight: 25,
             }}>
             <Text style={{fontSize: 12, color: '#ccc'}}>
-              {width} - {height}
+              {width.toFixed(0)} - {height.toFixed(0)}
             </Text>
           </View>
         </View>

src/pages/CounterMixins.js

@@ -806,7 +806,6 @@ const CounterMixins = ComposeComponent => {
         return;
       }
       barcode = barcode || this.barcode;
-      console.warn(barcode);
       if (isNaN(barcode.substring(0, 4))) {
         const msg = '请遮住条码旁边的二维码，再重新扫条码';
         this.setState({voiceModal: true, voiceTitle: msg});

src/pages/VerticalPage.js

@@ -644,6 +644,15 @@ class VerticalPage extends Component {
       styles.guide = {...styles.guide, backgroundColor: '#1b7dc7'};
     const facepay =
       this.state.faceType === 'wxpay' ? this.wxFacepay : this.smilepay;
+
+    let numSize = 450;
+
+    const numLen = totalNum.toString().length;
+
+    if (numLen > 2) {
+      numSize = (numSize * 2) / numLen;
+    }
+
     return (
       <View style={{flex: 1, position: 'relative'}}>
         <Modal visible={noBuyModal} transparent>
@@ -783,7 +792,7 @@ class VerticalPage extends Component {
                     background: '#ccc',
                     zIndex: 999,
                   }}>
-                  <Text style={{fontSize: 500}}>{totalNum}</Text>
+                  <Text style={{fontSize: numSize}}>{totalNum}</Text>
                 </View>
                 <View style={{backgroundColor: '#fff'}}>
                   <View