收银台界面

src/components/OrderDetailsModal.js

@@ -8,7 +8,7 @@ import Touch from './Touch';
 import NP from '../utils/np';
 import phone from '../assets/Vertical/phone.png';
 
-let pageSize = 7; // 分页大小
+let pageSize = 6; // 分页大小
 
 const mStyles = {
   ...ModalStyles,
@@ -255,6 +255,11 @@ class OrderDetailsModal extends Component {
                     ￥ {NP.round(totalPrice, 2).toFixed(2)}
                   </Text>
                 </View>
+                <View style={styles.tip}>
+                  <Text style={styles.tips}>
+                    ***请核对您的商品订单，将商品拿给买单的人***
+                  </Text>
+                </View>
               </View>
             </View>
           ) : (
@@ -398,6 +403,12 @@ const styles = {
     justifyContent: 'center',
     alignItems: 'center',
   },
+  tip: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    margin: 10,
+  },
   empty: {
     flexDirection: 'row',
     margin: 10,
@@ -409,7 +420,8 @@ const styles = {
   },
   tips: {
     fontSize: 30,
-    color: '#8B8989',
+    // color: '#8B8989',
+    color: 'red',
   },
   goodsStyle: {
     width: '100%',
@@ -510,7 +522,7 @@ const styles = {
   },
   realPay: {
     flexDirection: 'column',
-    height: '10%',
+    height: '16%',
     backgroundColor: '#FFF',
     marginLeft: '2%',
     marginRight: '2%',
@@ -519,7 +531,7 @@ const styles = {
     flex: 0.2,
     width: '100%',
     // backgroundColor: '#44c571',
-    backgroundColor: 'rgb(0,205,102)',
+    backgroundColor: 'rgb(68,197,113)',
   },
   phone: {
     width: 40,
@@ -552,7 +564,7 @@ const styles = {
     flex: 0.2,
     width: '100%',
     // backgroundColor: '#44c571',
-    backgroundColor: 'rgb(0,205,102)',
+    backgroundColor: 'rgb(68,197,113)',
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',

src/pages/FacePage.js

@@ -175,12 +175,13 @@ class FacePage extends Component {
           this.setState({phoneModal: true});
         } else {
           let goodsArr = [];
-          ret.orders &&
+          if (ret.orders) {
             ret.orders.map(v1 => {
               v1.goods.map(v2 => {
                 goodsArr.push(v2);
               });
             });
+          }
           this.setState({
             orderDetailsModal: true,
             goodsArr,