Commit 2335cdd0 by Denglingling

完善【历史订单】筛选弹窗高度布局、底部内容高度布局、错误提示弹窗消失时间

(cherry picked from commit dfd91c2c)
parent 5e6c06c9
......@@ -27,7 +27,7 @@ class ErrorTipModel extends Component {
}, () => {
setTimeout(() => {
that.closeModal()
}, 1000)
}, 500)
})
}
}
......
......@@ -8,7 +8,9 @@ import {
Image,
TouchableOpacity,
TextInput,
Platform
Platform,
Alert,
Linking
} from 'react-native';
import {
home_background_color,
......
......@@ -21,6 +21,7 @@ import {
third_text_color,
second_text_size,
Height,
pxHeight,
} from '../../base/BaseStyle';
import LodingModel from '../common/LodingModel';
import { connect } from 'react-redux';
......@@ -276,7 +277,6 @@ class HistoricalOrderPage extends Component {
// 关闭筛选弹窗 回调
handleCloseFilterModal(show) {
console.log('关闭筛选弹窗 回调======', show)
this.setState({
isShowSelect: show
})
......@@ -554,9 +554,9 @@ const styles = StyleSheet.create({
cont_main: {
backgroundColor: foundation_color,
maxHeight: Height() - 300,
maxHeight: Height() - 240,
minHeight: Height() - 358,
paddingBottom: 10
paddingBottom: pxHeight(60)
},
cont_scroll: {},
cont_box: {},
......
......@@ -1945,26 +1945,28 @@ class FilterModel extends Component {
</View>
<View style={styles.sea_btn_box}>
<TouchableOpacity
activeOpacity={.8}
activeOpacity={.9}
style={[styles.sea_btn_inner, styles.sea_btn_lef]}
onPress={() => this.handleSubResetCheck()}
>
<Text style={[styles.sea_btn_tit, styles.sea_btn_reset]}>重置</Text>
</TouchableOpacity>
<TouchableOpacity
activeOpacity={.8}
activeOpacity={.9}
style={styles.sea_btn_inner}
onPress={() => this.handleFilterSubmitCheck()}
>
<Text style={styles.sea_btn_tit}>确定</Text>
</TouchableOpacity>
{ this.renderErrorModel() }
</View>
{ this.renderDateModel() }
{ this.renderPickerModel() }
{ this.renderErrorModel() }
</View>
)
}
......@@ -2069,7 +2071,7 @@ const styles = StyleSheet.create({
flex: 1,
flexDirection: 'column',
// backgroundColor: '#FF0000',
height: Height() - 266
height: Height() - 186
},
cont_item_box: {},
top_box: {},
......@@ -2108,17 +2110,19 @@ const styles = StyleSheet.create({
fontWeight: 'bold'
},
top_sea_box: {
paddingVertical: 14,
// paddingVertical: 14,
position: 'relative',
backgroundColor: '#F5F5F5'
// backgroundColor: '#F5F5F5'
},
sea_inner: {
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: 24,
paddingTop: 14,
paddingBottom: 10,
borderBottomColor: '#C8C8C8',
borderBottomWidth: 1
borderBottomWidth: 1,
backgroundColor: '#F5F5F5'
},
sea_tit: {
fontSize: 14,
......@@ -2136,11 +2140,13 @@ const styles = StyleSheet.create({
sea_main: {},
sea_container: {
flex: 1
// flex: 1
height: Height()
},
sea_scr_box: {
height: Height() - 420,
backgroundColor: '#F5F5F5'
// height: Height() - 360,
backgroundColor: '#F5F5F5',
flex: 1
},
sea_scroll: {},
sea_sel_opt: {
......@@ -2305,12 +2311,14 @@ const styles = StyleSheet.create({
},
sea_btn_box: {
flexDirection: 'row'
flexDirection: 'row',
// flex: 1,
height: 38
},
sea_btn_inner: {
backgroundColor: promary_color,
width: '50%',
height: pxHeight(54)
height: 38,
},
sea_btn_lef: {
backgroundColor: '#E7F1FD'
......@@ -2319,7 +2327,7 @@ const styles = StyleSheet.create({
fontSize: 14,
fontFamily: font_family_regular,
textAlign: 'center',
lineHeight: pxHeight(50),
lineHeight: 36,
color: title_text_color
},
sea_btn_reset: {
......
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 sign in to comment