Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 4f5c7ec4 by Denglingling
Options

调整详情弹窗、库存不足弹窗样式 

(cherry picked from commit e3183866)
parent 26965bbc
Inline Side-by-side
Showing with 34 additions and 47 deletions
app/containers/common/NotEnoughModel.js
...@@ -24,11 +24,12 @@ import { ...@@ -24,11 +24,12 @@ import {
promary_color promary_color
} from '../../base/BaseStyle'; } from '../../base/BaseStyle';
/** 库存不足弹窗 */
class NotEnoughModel extends Component { class NotEnoughModel extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
isVisible: this.props.show, isVisible: false,
not_enough_items_list: this.props.not_enough_items_list, not_enough_items_list: this.props.not_enough_items_list,
title: '以下物品缺失，是否继续提交?' title: '以下物品缺失，是否继续提交?'
} }
...@@ -135,7 +136,7 @@ class NotEnoughModel extends Component { ...@@ -135,7 +136,7 @@ class NotEnoughModel extends Component {
) )
} }
render() { render() {
return ( return (
<View style={styles.dia_container}> <View style={styles.dia_container}>
<Modal <Modal
...@@ -145,8 +146,8 @@ class NotEnoughModel extends Component { ...@@ -145,8 +146,8 @@ class NotEnoughModel extends Component {
onRequestClose={() => this.closeModal()}> onRequestClose={() => this.closeModal()}>
<View style={safe_view}> <View style={safe_view}>
<TouchableOpacity style={styles.container} activeOpacity={1} <TouchableOpacity style={styles.container} activeOpacity={1}
// onPress={() => this.closeModal()} // onPress={() => this.closeModal()}
> >
{this.renderDialog()} {this.renderDialog()}
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -164,7 +165,7 @@ const styles = StyleSheet.create({ ...@@ -164,7 +165,7 @@ const styles = StyleSheet.create({
width: '80%', width: '80%',
maxHeight: '80%', maxHeight: '80%',
backgroundColor: '#FFF', backgroundColor: '#FFF',
borderRadius: 10 borderRadius: 8
}, },
container: { container: {
flex: 1, flex: 1,
...@@ -180,40 +181,25 @@ const styles = StyleSheet.create({ ...@@ -180,40 +181,25 @@ const styles = StyleSheet.create({
position: "absolute", position: "absolute",
left: 0, left: 0,
top: '26%', top: '26%',
width: Width() - 40, width: Width() - 44,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: "column",
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
minHeight: pxHeight(380), minHeight: pxHeight(380),
borderRadius: 20, borderRadius: 8,
marginHorizontal: 20, marginHorizontal: 22,
paddingHorizontal: 20, paddingHorizontal: 22,
paddingTop: 20, paddingTop: 20,
paddingBottom: 30 paddingBottom: 30
}, },
item: {
width: Width(),
height: 40,
paddingLeft: 20,
paddingRight: 20,
alignItems: 'center'
},
itemText: {
fontSize: 16,
color: third_text_color
},
curr_item: {
color: first_text_color,
fontWeight: 'bold'
},
scro_box: { scro_box: {
marginTop: 14, marginTop: 18,
maxHeight: pxHeight(320), maxHeight: pxHeight(310),
minHeight: pxHeight(220), minHeight: pxHeight(220),
borderWidth: 1, borderWidth: 1,
borderColor: '#eaeaea', borderColor: '#eaeaea',
paddingLeft: 6, paddingLeft: 6,
borderRadius: 4, borderRadius: 2,
paddingBottom: 6 paddingBottom: 6
}, },
item_scroll: {}, item_scroll: {},
...@@ -227,17 +213,18 @@ const styles = StyleSheet.create({ ...@@ -227,17 +213,18 @@ const styles = StyleSheet.create({
alignItems: 'center' alignItems: 'center'
}, },
err_icon: { err_icon: {
width: pxSize(18), width: pxSize(20),
height: pxSize(18), height: pxSize(20),
marginRight: 4 marginRight: 6
}, },
inner_tit: { inner_tit: {
fontSize: 16, fontSize: 18,
fontFamily: font_family_medium fontFamily: font_family_semibold
}, },
head_tou_clo: { head_tou_clo: {
width: pxSize(24), width: pxSize(26),
height: pxSize(24) height: pxSize(26),
marginBottom: 10
}, },
cont_list: {}, cont_list: {},
co_li: { co_li: {
...@@ -270,8 +257,8 @@ const styles = StyleSheet.create({ ...@@ -270,8 +257,8 @@ const styles = StyleSheet.create({
foo_btn: { foo_btn: {
width: '38%', width: '38%',
height: pxSize(36), height: pxSize(36),
borderRadius: 5, borderRadius: 4,
marginTop: 20 marginTop: 24
}, },
btn_cel: { btn_cel: {
backgroundColor: '#E7F1FD' backgroundColor: '#E7F1FD'
......
app/containers/common/ShowModel.js
...@@ -17,6 +17,7 @@ import { ...@@ -17,6 +17,7 @@ import {
font_family_semibold font_family_semibold
} from '../../base/BaseStyle'; } from '../../base/BaseStyle';
/** 历史订单详情弹窗 */
class ShowModel extends Component { class ShowModel extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -73,8 +74,8 @@ class ShowModel extends Component { ...@@ -73,8 +74,8 @@ class ShowModel extends Component {
onRequestClose={() => this.closeModal()}> onRequestClose={() => this.closeModal()}>
<View style={safe_view}> <View style={safe_view}>
<TouchableOpacity style={styles.container} activeOpacity={1} <TouchableOpacity style={styles.container} activeOpacity={1}
// onPress={() => this.closeModal()} // onPress={() => this.closeModal()}
> >
{this.renderDialog()} {this.renderDialog()}
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -101,15 +102,15 @@ const styles = StyleSheet.create({ ...@@ -101,15 +102,15 @@ const styles = StyleSheet.create({
position: "absolute", position: "absolute",
left: 0, left: 0,
top: '26%', top: '26%',
width: Width() - 40, width: Width() - 44,
flex: 1, flex: 1,
flexDirection: "column", flexDirection: "column",
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
minHeight: pxHeight(380), minHeight: pxHeight(300),
maxHeight: pxHeight(480), maxHeight: pxHeight(480),
borderRadius: 20, borderRadius: 8,
marginHorizontal: 20, marginHorizontal: 22,
paddingHorizontal: 20, paddingHorizontal: 22,
paddingTop: 20, paddingTop: 20,
paddingBottom: 30 paddingBottom: 30
}, },
...@@ -125,8 +126,9 @@ const styles = StyleSheet.create({ ...@@ -125,8 +126,9 @@ const styles = StyleSheet.create({
flex: 1 flex: 1
}, },
head_tou_clo: { head_tou_clo: {
width: pxSize(28), width: pxSize(26),
height: pxSize(28) height: pxSize(26),
marginBottom: 12
}, },
model_cont: { model_cont: {
paddingTop: 20 paddingTop: 20
......
app/containers/historicalOrder/module/LineOrderPage.js
...@@ -204,9 +204,7 @@ class LineOrderPage extends Component { ...@@ -204,9 +204,7 @@ class LineOrderPage extends Component {
destination_surgery_collect_number: supData.destination_surgery_collect_number, destination_surgery_collect_number: supData.destination_surgery_collect_number,
source_surgery_order_number: supData.source_surgery_order_number source_surgery_order_number: supData.source_surgery_order_number
} }
console.log('params----------', params)
let conResult = await requestGetLineFormTrans(props.global_domain_config, params) let conResult = await requestGetLineFormTrans(props.global_domain_config, params)
console.log('conResult----------', conResult)
if(conResult.error_code == 0) { if(conResult.error_code == 0) {
that.changeSubLoding(false) that.changeSubLoding(false)
// 成功 // 成功
......
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