Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
gm_flutter
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林生雨
gm_flutter
Commits
109daea9
Commit
109daea9
authored
Jul 02, 2020
by
林生雨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'featrue/duxin' into 'test'
Featrue/duxin See merge request
!4
parents
a5a10489
8c323111
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
23 deletions
+33
-23
LevelTwoPage.dart
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
+2
-2
MechanismBoxPage.dart
lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart
+31
-21
No files found.
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @
109daea9
...
@@ -84,7 +84,7 @@ class _LevelTwoPageState extends BaseState<LevelTwoPage>
...
@@ -84,7 +84,7 @@ class _LevelTwoPageState extends BaseState<LevelTwoPage>
SliverFillRemaining
(
SliverFillRemaining
(
child:
TabBarView
(
child:
TabBarView
(
controller:
this
.
tabController
,
controller:
this
.
tabController
,
children:
<
Widget
>[
Container
(),
Container
()]))
children:
<
Widget
>[
pages
(),
pages
()]))
]),
]),
Positioned
(
left:
0
,
right:
0
,
bottom:
0
,
child:
bottomWidget
())
Positioned
(
left:
0
,
right:
0
,
bottom:
0
,
child:
bottomWidget
())
],
],
...
@@ -318,7 +318,7 @@ class _LevelTwoPageState extends BaseState<LevelTwoPage>
...
@@ -318,7 +318,7 @@ class _LevelTwoPageState extends BaseState<LevelTwoPage>
child:
ListView
.
builder
(
child:
ListView
.
builder
(
physics:
NeverScrollableScrollPhysics
(),
physics:
NeverScrollableScrollPhysics
(),
itemBuilder:
(
c
,
index
)
{
itemBuilder:
(
c
,
index
)
{
return
DoctorItem
(
c
,
[]
);
return
Text
(
'
$index
'
);
},
},
itemCount:
5
,
itemCount:
5
,
));
));
...
...
lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart
View file @
109daea9
import
'package:flutter/material.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart'
;
import
'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart'
;
import
'../../../commonModel/GMBase.dart'
;
import
'../../../commonModel/base/BaseComponent.dart'
;
import
'../../../commonModel/base/BaseComponent.dart'
;
class
MechanismBox
implements
IBottomPicker
{
class
MechanismBox
implements
IBottomPicker
{
VoidCallback
dismissCall
;
VoidCallback
dismissCall
;
TextEditingController
textController
=
TextEditingController
();
@override
@override
initState
(
dismissCall
,
BuildContext
context
)
{
initState
(
dismissCall
,
BuildContext
context
)
{
this
.
dismissCall
=
dismissCall
;
this
.
dismissCall
=
dismissCall
;
...
@@ -14,7 +11,7 @@ class MechanismBox implements IBottomPicker {
...
@@ -14,7 +11,7 @@ class MechanismBox implements IBottomPicker {
Widget
build
(
BuildContext
context
)
{
Widget
build
(
BuildContext
context
)
{
MediaQueryData
mq
=
MediaQuery
.
of
(
context
);
MediaQueryData
mq
=
MediaQuery
.
of
(
context
);
TextEditingController
textController
=
TextEditingController
()
;
double
keyHeight
=
MediaQuery
.
of
(
context
).
viewInsets
.
bottom
;
return
ClipRRect
(
return
ClipRRect
(
borderRadius:
BorderRadius
.
only
(
borderRadius:
BorderRadius
.
only
(
topLeft:
Radius
.
circular
(
10.0
),
topRight:
Radius
.
circular
(
10.0
)),
topLeft:
Radius
.
circular
(
10.0
),
topRight:
Radius
.
circular
(
10.0
)),
...
@@ -22,8 +19,7 @@ class MechanismBox implements IBottomPicker {
...
@@ -22,8 +19,7 @@ class MechanismBox implements IBottomPicker {
width:
mq
.
size
.
width
,
width:
mq
.
size
.
width
,
height:
mq
.
size
.
height
-
140
,
height:
mq
.
size
.
height
-
140
,
color:
Colors
.
white
,
color:
Colors
.
white
,
child:
Column
(
child:
Stack
(
mainAxisAlignment:
MainAxisAlignment
.
start
,
children:
<
Widget
>[
children:
<
Widget
>[
Container
(
Container
(
margin:
EdgeInsets
.
only
(
left:
20
,
right:
20
),
margin:
EdgeInsets
.
only
(
left:
20
,
right:
20
),
...
@@ -62,8 +58,9 @@ class MechanismBox implements IBottomPicker {
...
@@ -62,8 +58,9 @@ class MechanismBox implements IBottomPicker {
),
),
),
),
Container
(
Container
(
height:
mq
.
size
.
height
-
140
-
50
-
96
,
height:
mq
.
size
.
height
-
140
-
96
-
50
,
width:
mq
.
size
.
width
,
width:
mq
.
size
.
width
,
margin:
EdgeInsets
.
only
(
top:
50
),
padding:
EdgeInsets
.
only
(
left:
20
,
right:
20
),
padding:
EdgeInsets
.
only
(
left:
20
,
right:
20
),
child:
ListView
.
separated
(
child:
ListView
.
separated
(
itemCount:
100
,
itemCount:
100
,
...
@@ -74,13 +71,19 @@ class MechanismBox implements IBottomPicker {
...
@@ -74,13 +71,19 @@ class MechanismBox implements IBottomPicker {
return
Divider
(
color:
Color
(
0xffE5E5E5
));
return
Divider
(
color:
Color
(
0xffE5E5E5
));
},
},
)),
)),
Container
(
Positioned
(
bottom:
keyHeight
==
0
?
0
:
keyHeight
,
left:
0
,
width:
double
.
maxFinite
,
height:
96
,
child:
Container
(
height:
96
,
height:
96
,
color:
Color
(
0xffF9F8FB
),
color:
Color
(
0xffF9F8FB
),
child:
Column
(
child:
Column
(
children:
<
Widget
>[
children:
<
Widget
>[
Container
(
Container
(
height:
25
,
height:
25
,
color:
Colors
.
black
,
width:
double
.
maxFinite
,
width:
double
.
maxFinite
,
margin:
EdgeInsets
.
only
(
top:
12
),
margin:
EdgeInsets
.
only
(
top:
12
),
child:
ListView
(
child:
ListView
(
...
@@ -119,9 +122,11 @@ class MechanismBox implements IBottomPicker {
...
@@ -119,9 +122,11 @@ class MechanismBox implements IBottomPicker {
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
decoration:
BoxDecoration
(
decoration:
BoxDecoration
(
border:
Border
.
all
(
border:
Border
.
all
(
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffffffff
),
color:
Color
(
0xffffffff
),
borderRadius:
BorderRadius
.
circular
(
20
)),
borderRadius:
BorderRadius
.
circular
(
20
)),
child:
Text
(
child:
Text
(
'111有优惠活动吗?'
,
'111有优惠活动吗?'
,
style:
TextStyle
(
style:
TextStyle
(
...
@@ -135,9 +140,11 @@ class MechanismBox implements IBottomPicker {
...
@@ -135,9 +140,11 @@ class MechanismBox implements IBottomPicker {
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
decoration:
BoxDecoration
(
decoration:
BoxDecoration
(
border:
Border
.
all
(
border:
Border
.
all
(
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffffffff
),
color:
Color
(
0xffffffff
),
borderRadius:
BorderRadius
.
circular
(
20
)),
borderRadius:
BorderRadius
.
circular
(
20
)),
child:
Text
(
child:
Text
(
'111有优惠活动吗?'
,
'111有优惠活动吗?'
,
style:
TextStyle
(
style:
TextStyle
(
...
@@ -151,9 +158,11 @@ class MechanismBox implements IBottomPicker {
...
@@ -151,9 +158,11 @@ class MechanismBox implements IBottomPicker {
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
padding:
EdgeInsets
.
only
(
left:
8
,
right:
8
),
decoration:
BoxDecoration
(
decoration:
BoxDecoration
(
border:
Border
.
all
(
border:
Border
.
all
(
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffffffff
),
color:
Color
(
0xffffffff
),
borderRadius:
BorderRadius
.
circular
(
20
)),
borderRadius:
BorderRadius
.
circular
(
20
)),
child:
Text
(
child:
Text
(
'111有优惠活动吗?'
,
'111有优惠活动吗?'
,
style:
TextStyle
(
style:
TextStyle
(
...
@@ -166,7 +175,8 @@ class MechanismBox implements IBottomPicker {
...
@@ -166,7 +175,8 @@ class MechanismBox implements IBottomPicker {
),
),
Container
(
Container
(
height:
35
,
height:
35
,
margin:
EdgeInsets
.
only
(
top:
12
,
left:
15
,
right:
15
),
margin:
EdgeInsets
.
only
(
top:
12
,
left:
15
,
right:
15
),
decoration:
BoxDecoration
(
decoration:
BoxDecoration
(
border:
Border
.
all
(
border:
Border
.
all
(
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
color:
Color
(
0xffE5E5E5
),
width:
0.5
),
...
@@ -175,15 +185,15 @@ class MechanismBox implements IBottomPicker {
...
@@ -175,15 +185,15 @@ class MechanismBox implements IBottomPicker {
child:
TextField
(
child:
TextField
(
controller:
textController
,
controller:
textController
,
keyboardType:
TextInputType
.
text
,
keyboardType:
TextInputType
.
text
,
textInputAction:
TextInputAction
.
send
,
onSubmitted:
(
txt
)
{},
decoration:
InputDecoration
(
decoration:
InputDecoration
(
contentPadding:
EdgeInsets
.
all
(
16.0
),
contentPadding:
EdgeInsets
.
all
(
16.0
),
labelText:
'文案文案文案不知道文案是啥'
,
labelText:
'文案文案文案不知道文案是啥'
,
border:
InputBorder
.
none
),
border:
InputBorder
.
none
)),
autofocus:
false
,
),
)
)
],
],
))
)
))
],
],
)),
)),
);
);
...
@@ -191,6 +201,6 @@ class MechanismBox implements IBottomPicker {
...
@@ -191,6 +201,6 @@ class MechanismBox implements IBottomPicker {
@override
@override
void
dispose
()
{
void
dispose
()
{
dismissCall
();
textController
.
dispose
();
}
}
}
}
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