1、增加【弹窗】的【错误提示】弹窗；2、完善【IOS】下筛选的布局

app/containers/common/ErrorTipModel.js

+import React, { Component } from 'react';
+import {
+    View,
+    Text,
+    StyleSheet,
+    Modal,
+    TouchableOpacity
+} from 'react-native';
+import {
+    safe_view,
+    font_family_regular
+} from '../../base/BaseStyle';
+
+class ErrorTipModel extends Component {
+    constructor(props) {
+        super(props);
+        this.state = { 
+            isVisible: false
+         }
+    }
+
+    componentWillReceiveProps(nextProps) {
+        let that = this
+        if(this.state.isVisible != nextProps.show) {
+            this.setState({
+                isVisible: nextProps.show
+            }, () => {
+                setTimeout(() => {
+                    that.closeModal()
+                }, 1000)
+            })
+        }
+    }
+
+    closeModal() {
+        this.setState({
+            isVisible: false
+        })
+        this.props.closeModal(false)
+    }
+
+    renderDialog() {
+        let { title } = this.props
+        return(
+            <View style={styles.dia_inner}>
+                <View style={styles.dia_box}>
+                    <Text style={styles.main_txt}>
+                        {title}
+                    </Text>
+                </View>
+            </View>
+        )
+    }
+
+    render() { 
+        return ( 
+            <View style={styles.dia_container}>
+                <Modal
+                    transparent={true}
+                    visible={this.state.isVisible}
+                    animationType={'fade'}
+                    >
+                    <View style={safe_view}>
+                        <TouchableOpacity style={styles.container} activeOpacity={1}>
+                           {this.renderDialog()}
+                        </TouchableOpacity>
+                    </View>
+                </Modal>
+            </View>
+         );
+    }
+}
+
+const styles = StyleSheet.create({
+    dia_container: {
+        flex: 1
+    },
+    container: {
+        flex: 1
+    },
+    dia_inner: {
+        position: 'relative',
+        flex: 1
+    },
+    dia_box: {
+        position: 'absolute',
+        left: 20,
+        top: '52%',
+        right: 20,
+        flex: 1,
+        alignItems: 'center'
+    },
+    main_txt: {
+        fontSize: 14,
+        fontFamily: font_family_regular,
+        color: '#fafafa',
+        backgroundColor: '#3d3e3d',
+        paddingHorizontal: 10,
+        textAlign: 'center'
+    },
+
+})
+ 
+export default ErrorTipModel;

app/containers/common/ShowModel.js

@@ -5,9 +5,7 @@ import {
     StyleSheet,
     StyleSheet,
     Modal,
     Modal,
     TouchableOpacity,
     TouchableOpacity,
-    Image,
-    SafeAreaView,
-    ScrollView
+    Image
 } from 'react-native';
 } from 'react-native';
 import {
 import {
     Width,
     Width,
@@ -16,7 +14,6 @@ import {
     pxSize,
     pxSize,
     safe_view,
     safe_view,
     icon_style,
     icon_style,
-    font_family_medium,
     font_family_semibold
     font_family_semibold
 } from '../../base/BaseStyle';
 } from '../../base/BaseStyle';
 
 
@@ -97,7 +94,6 @@ const styles = StyleSheet.create({
     },
     },
     opt_area: {
     opt_area: {
         flex: 1,
         flex: 1,
-        // flexDirection: 'column',
         justifyContent: 'center',
         justifyContent: 'center',
         position: 'relative'
         position: 'relative'
     },
     },
@@ -109,8 +105,6 @@ const styles = StyleSheet.create({
         flex: 1,
         flex: 1,
         flexDirection: "column",
         flexDirection: "column",
         backgroundColor: '#ffffff',
         backgroundColor: '#ffffff',
-        // borderTopLeftRadius: 20,
-        // borderTopRightRadius: 20,
         minHeight: pxHeight(380),
         minHeight: pxHeight(380),
         maxHeight: pxHeight(480),
         maxHeight: pxHeight(480),
         borderRadius: 20,
         borderRadius: 20,
@@ -134,14 +128,8 @@ const styles = StyleSheet.create({
         width: pxSize(28),
         width: pxSize(28),
         height: pxSize(28)
         height: pxSize(28)
     },
     },
-    // clo_icon: {
-    //     width: '100%',
-    //     height: '100%'
-    // },
     model_cont: {
     model_cont: {
-        paddingTop: 20,
-        // height: pxHeight(220),
-        // flex: 1
+        paddingTop: 20
     },
     },
 })
 })
  
  

app/containers/historicalOrder/HistoricalOrderPage.js

@@ -16,12 +16,10 @@ import {
     first_text_color,
     first_text_color,
     font_family_regular,
     font_family_regular,
     pxSize,
     pxSize,
-    title_text_color,
     promary_text_color,
     promary_text_color,
     font_family_medium,
     font_family_medium,
     third_text_color,
     third_text_color,
     second_text_size,
     second_text_size,
-    pxHeight,
     Height,
     Height,
 } from '../../base/BaseStyle';
 } from '../../base/BaseStyle';
 import LodingModel from '../common/LodingModel';
 import LodingModel from '../common/LodingModel';
@@ -556,7 +554,7 @@ const styles = StyleSheet.create({
 
 
     cont_main: {
     cont_main: {
         backgroundColor: foundation_color,
         backgroundColor: foundation_color,
-        maxHeight: Height() - 258,
+        maxHeight: Height() - 300,
         minHeight: Height() - 358,
         minHeight: Height() - 358,
         paddingBottom: 10
         paddingBottom: 10
     },
     },

app/containers/home/module/TabBottomItem.js

@@ -35,7 +35,6 @@ class TabBottomItem extends Component {
     // 返回每一个tab
     // 返回每一个tab
     renderTabOption(tab, i) {
     renderTabOption(tab, i) {
         const color = this.props.activeTab == i ?  "#6B8E23" : "#ADADAD"; // 判断i是否是当前选中的tab，设置不同的颜色
         const color = this.props.activeTab == i ?  "#6B8E23" : "#ADADAD"; // 判断i是否是当前选中的tab，设置不同的颜色
-        console.log('props.activeTab---', tab, i)
         let {props} = this
         let {props} = this
         return(
         return(
             <TouchableOpacity
             <TouchableOpacity
@@ -88,9 +87,7 @@ const styles = StyleSheet.create({
         shadowOpacity: 1,
         shadowOpacity: 1,
         elevation: 10,
         elevation: 10,
     },
     },
-    tab_opt: {
-        // backgroundColor: 'red'
-    },
+    tab_opt: {},
     tab_item_box: {
     tab_item_box: {
         alignItems: 'center',
         alignItems: 'center',
         paddingVertical: 10,
         paddingVertical: 10,