Skip to content

G
gm_flutter
Commit 51d8dafd authored by 林生雨's avatar 林生雨
Browse files
Options

Merge branch 'featrue/duxin' into 'test' 

Featrue/duxin

See merge request !30
parents 4b3b9396 1659adba
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 21 deletions
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 51d8dafd
...@@ -553,6 +553,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -553,6 +553,7 @@ class LevelOneState extends BaseState<LevelOnePage>
}, },
child: Container( child: Container(
width: ScreenUtil().setWidth(137), width: ScreenUtil().setWidth(137),
margin: EdgeInsets.only(left: 20),
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xff51CDC7), color: Color(0xff51CDC7),
...@@ -571,6 +572,14 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -571,6 +572,14 @@ class LevelOneState extends BaseState<LevelOnePage>
.jumpPage(context, "show_login", null, true); .jumpPage(context, "show_login", null, true);
return; return;
} }
Map<String, dynamic> map = {
"page_name": "level_one_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
DiscussLowPricePopView.showPopView( DiscussLowPricePopView.showPopView(
context, widget.PAGE_NAME, "${widget.planId}", "", ""); context, widget.PAGE_NAME, "${widget.planId}", "", "");
}, },
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 51d8dafd
...@@ -513,6 +513,7 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -513,6 +513,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
}, },
child: Container( child: Container(
width: ScreenUtil().setWidth(137), width: ScreenUtil().setWidth(137),
margin: EdgeInsets.only(left: 20),
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xff51CDC7), color: Color(0xff51CDC7),
......
lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart
View file @ 51d8dafd
...@@ -138,11 +138,11 @@ class MechanismBox implements IBottomPicker { ...@@ -138,11 +138,11 @@ class MechanismBox implements IBottomPicker {
// 弹窗标题 // 弹窗标题
Widget title(mq) { Widget title(mq) {
return Container( return Container(
margin: EdgeInsets.only(left: 20, right: 20), margin: EdgeInsets.only(left: 15, right: 15),
width: mq.size.width, width: mq.size.width,
decoration: BoxDecoration( decoration: BoxDecoration(
border: border:
Border(bottom: BorderSide(width: 1, color: Color(0xffE5E5E5)))), Border(bottom: BorderSide(width: .5, color: Color(0xffE5E5E5)))),
height: 50, height: 50,
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
...@@ -150,22 +150,19 @@ class MechanismBox implements IBottomPicker { ...@@ -150,22 +150,19 @@ class MechanismBox implements IBottomPicker {
Container( Container(
child: Text( child: Text(
'请选择要咨询的机构', '请选择要咨询的机构',
style: TextStyle( style: TextStyle(color: Color(0xff282828), fontSize: 17),
color: Color(0xff282828),
fontSize: 17,
fontWeight: FontWeight.bold),
), ),
), ),
Positioned( Positioned(
right: 0, right: 5,
top: 16.0, top: 16.5,
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
dismissCall(); dismissCall();
}, },
child: Container( child: Container(
width: 14, width: 13.5,
height: 14, height: 13.5,
child: Image.asset("assets/close-btn.png"), child: Image.asset("assets/close-btn.png"),
), ),
)) ))
...@@ -198,7 +195,7 @@ class MechanismBox implements IBottomPicker { ...@@ -198,7 +195,7 @@ class MechanismBox implements IBottomPicker {
(BuildContext context, int index) { (BuildContext context, int index) {
if (index == _levelModel.data.length) { if (index == _levelModel.data.length) {
return Container( return Container(
height: 40, height: 0,
color: Color(0xffF7F6FA), color: Color(0xffF7F6FA),
); );
} }
...@@ -225,7 +222,6 @@ class MechanismBox implements IBottomPicker { ...@@ -225,7 +222,6 @@ class MechanismBox implements IBottomPicker {
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
print(hospital.toJson());
if (doctor_ids.indexOf(hospital.doctorId) != -1) { if (doctor_ids.indexOf(hospital.doctorId) != -1) {
doctor_ids.remove(hospital.doctorId); doctor_ids.remove(hospital.doctorId);
} else { } else {
...@@ -239,7 +235,7 @@ class MechanismBox implements IBottomPicker { ...@@ -239,7 +235,7 @@ class MechanismBox implements IBottomPicker {
height: 91.5, height: 91.5,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide(width: 1, color: Color(0xffE5E5E5)))), bottom: BorderSide(width: .5, color: Color(0xffE5E5E5)))),
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
Positioned( Positioned(
...@@ -265,9 +261,8 @@ class MechanismBox implements IBottomPicker { ...@@ -265,9 +261,8 @@ class MechanismBox implements IBottomPicker {
), ),
Positioned( Positioned(
left: 89, left: 89,
top: 15, top: 16,
child: child: baseText(hospital.name, 15, Color(0xff333333)),
baseText(hospital.name, 15, Color(0xff333333), bold: true),
), ),
Positioned( Positioned(
top: 38, top: 38,
...@@ -278,12 +273,13 @@ class MechanismBox implements IBottomPicker { ...@@ -278,12 +273,13 @@ class MechanismBox implements IBottomPicker {
children: <Widget>[ children: <Widget>[
baseText("¥", 12, Color(0xffFF5963)), baseText("¥", 12, Color(0xffFF5963)),
baseText("${hospital.minPrice}-${hospital.maxPrice}", 15, baseText("${hospital.minPrice}-${hospital.maxPrice}", 15,
Color(0xffFF5963)), Color(0xffFF5963),
bold: true),
], ],
), ),
), ),
Positioned( Positioned(
bottom: 21, bottom: 16,
left: 89, left: 89,
child: Container( child: Container(
width: 230, width: 230,
...@@ -292,7 +288,7 @@ class MechanismBox implements IBottomPicker { ...@@ -292,7 +288,7 @@ class MechanismBox implements IBottomPicker {
), ),
Positioned( Positioned(
left: 89, left: 89,
top: 38.5, top: 40,
child: FiveStarView(int.parse(hospital.star), 5), child: FiveStarView(int.parse(hospital.star), 5),
) )
], ],
...@@ -399,12 +395,17 @@ class MechanismBox implements IBottomPicker { ...@@ -399,12 +395,17 @@ class MechanismBox implements IBottomPicker {
} }
} }
}, },
style: TextStyle(fontSize: 12), style:
TextStyle(fontSize: 14, color: Color(0xff282828)),
maxLines: 1, maxLines: 1,
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: EdgeInsets.only( contentPadding: EdgeInsets.only(
left: 16, top: 0, bottom: 12, right: 16), left: 16, top: 0, bottom: 11.5, right: 16),
hintText: '请输入您想了解的问题', hintText: '请输入您想了解的问题',
hintStyle: TextStyle(
color: Color(0xff999999),
fontSize: 12,
height: 2.2),
border: InputBorder.none)); border: InputBorder.none));
}, },
)) ))
......
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 to comment