Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
zhangzhonghua
/
BoneHouse_Business_APP
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4f5c7ec4
authored
Aug 12, 2020
by
Denglingling
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整详情弹窗、库存不足弹窗样式
(cherry picked from commit
e3183866
)
parent
26965bbc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
42 deletions
app/containers/common/NotEnoughModel.js
app/containers/common/ShowModel.js
app/containers/historicalOrder/module/LineOrderPage.js
app/containers/common/NotEnoughModel.js
View file @
4f5c7ec4
...
@@ -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
:
'以下物品缺失,是否继续提交?'
}
}
...
@@ -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
()
-
4
0
,
width
:
Width
()
-
4
4
,
flex
:
1
,
flex
:
1
,
flexDirection
:
"column"
,
flexDirection
:
"column"
,
backgroundColor
:
'#ffffff'
,
backgroundColor
:
'#ffffff'
,
minHeight
:
pxHeight
(
380
),
minHeight
:
pxHeight
(
380
),
borderRadius
:
20
,
borderRadius
:
8
,
marginHorizontal
:
2
0
,
marginHorizontal
:
2
2
,
paddingHorizontal
:
2
0
,
paddingHorizontal
:
2
2
,
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
:
1
4
,
marginTop
:
1
8
,
maxHeight
:
pxHeight
(
3
2
0
),
maxHeight
:
pxHeight
(
3
1
0
),
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
:
1
6
,
fontSize
:
1
8
,
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
:
2
0
marginTop
:
2
4
},
},
btn_cel
:
{
btn_cel
:
{
backgroundColor
:
'#E7F1FD'
backgroundColor
:
'#E7F1FD'
...
...
app/containers/common/ShowModel.js
View file @
4f5c7ec4
...
@@ -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
);
...
@@ -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
()
-
4
0
,
width
:
Width
()
-
4
4
,
flex
:
1
,
flex
:
1
,
flexDirection
:
"column"
,
flexDirection
:
"column"
,
backgroundColor
:
'#ffffff'
,
backgroundColor
:
'#ffffff'
,
minHeight
:
pxHeight
(
3
8
0
),
minHeight
:
pxHeight
(
3
0
0
),
maxHeight
:
pxHeight
(
480
),
maxHeight
:
pxHeight
(
480
),
borderRadius
:
20
,
borderRadius
:
8
,
marginHorizontal
:
2
0
,
marginHorizontal
:
2
2
,
paddingHorizontal
:
2
0
,
paddingHorizontal
:
2
2
,
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
View file @
4f5c7ec4
...
@@ -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
)
// 成功
// 成功
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment