Commit 1798b466 by 黄日华

收银程序大数量显示字体大小调整

parent daa61daf
...@@ -28,7 +28,7 @@ class HomeLayout extends Component { ...@@ -28,7 +28,7 @@ class HomeLayout extends Component {
paddingRight: 25, paddingRight: 25,
}}> }}>
<Text style={{fontSize: 12, color: '#ccc'}}> <Text style={{fontSize: 12, color: '#ccc'}}>
{width} - {height} {width.toFixed(0)} - {height.toFixed(0)}
</Text> </Text>
</View> </View>
</View> </View>
......
...@@ -804,7 +804,6 @@ const CounterMixins = ComposeComponent => { ...@@ -804,7 +804,6 @@ const CounterMixins = ComposeComponent => {
return; return;
} }
barcode = barcode || this.barcode; barcode = barcode || this.barcode;
console.warn(barcode);
if (isNaN(barcode.substring(0, 4))) { if (isNaN(barcode.substring(0, 4))) {
const msg = '请遮住条码旁边的二维码,再重新扫条码'; const msg = '请遮住条码旁边的二维码,再重新扫条码';
this.setState({voiceModal: true, voiceTitle: msg}); this.setState({voiceModal: true, voiceTitle: msg});
......
...@@ -644,6 +644,15 @@ class VerticalPage extends Component { ...@@ -644,6 +644,15 @@ class VerticalPage extends Component {
styles.guide = {...styles.guide, backgroundColor: '#1b7dc7'}; styles.guide = {...styles.guide, backgroundColor: '#1b7dc7'};
const facepay = const facepay =
this.state.faceType === 'wxpay' ? this.wxFacepay : this.smilepay; this.state.faceType === 'wxpay' ? this.wxFacepay : this.smilepay;
let numSize = 450;
const numLen = totalNum.toString().length;
if (numLen > 2) {
numSize = (numSize * 2) / numLen;
}
return ( return (
<View style={{flex: 1, position: 'relative'}}> <View style={{flex: 1, position: 'relative'}}>
<Modal visible={noBuyModal} transparent> <Modal visible={noBuyModal} transparent>
...@@ -783,7 +792,7 @@ class VerticalPage extends Component { ...@@ -783,7 +792,7 @@ class VerticalPage extends Component {
background: '#ccc', background: '#ccc',
zIndex: 999, zIndex: 999,
}}> }}>
<Text style={{fontSize: 500}}>{totalNum}</Text> <Text style={{fontSize: numSize}}>{totalNum}</Text>
</View> </View>
<View style={{backgroundColor: '#fff'}}> <View style={{backgroundColor: '#fff'}}>
<View <View
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment