Skip to content

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

w

parent c459f15f
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 115 deletions
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ e4a4ead0
...@@ -12,6 +12,7 @@ import 'package:flutter/cupertino.dart'; ...@@ -12,6 +12,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart'; import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart';
import 'package:flutter_screenutil/screenutil.dart';
import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart'; import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart'; import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart'; import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart';
...@@ -132,6 +133,11 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -132,6 +133,11 @@ class LevelOneState extends BaseState<LevelOnePage>
Expanded( Expanded(
child: newHomeWarp(), child: newHomeWarp(),
), ),
Container(
height: 0.5,
width: double.maxFinite,
color: Color(0xffE5E5E5),
),
bottomWidget(), bottomWidget(),
], ],
))), () { ))), () {
...@@ -245,6 +251,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -245,6 +251,7 @@ class LevelOneState extends BaseState<LevelOnePage>
} }
Widget head() { Widget head() {
print("SCRRNWIDTH ${MediaQuery.of(context).size.width}");
return Container( return Container(
key: keyTop, key: keyTop,
width: double.maxFinite, width: double.maxFinite,
...@@ -489,14 +496,11 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -489,14 +496,11 @@ class LevelOneState extends BaseState<LevelOnePage>
} }
Widget bottomWidget() { Widget bottomWidget() {
return Align( return Container(
alignment: Alignment.bottomCenter,
child: Container(
width: double.maxFinite, width: double.maxFinite,
height: 55, height: 55,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
...@@ -509,7 +513,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -509,7 +513,7 @@ class LevelOneState extends BaseState<LevelOnePage>
false); false);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 18), margin: EdgeInsets.only(left: 21),
width: 30, width: 30,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
...@@ -527,6 +531,9 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -527,6 +531,9 @@ class LevelOneState extends BaseState<LevelOnePage>
), ),
), ),
), ),
Expanded(
child: Container(),
),
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
...@@ -545,8 +552,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -545,8 +552,7 @@ class LevelOneState extends BaseState<LevelOnePage>
..show(context); ..show(context);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 15), width: ScreenUtil().setWidth(137),
width: 135,
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xff51CDC7), color: Color(0xff51CDC7),
...@@ -579,8 +585,8 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -579,8 +585,8 @@ class LevelOneState extends BaseState<LevelOnePage>
context, widget.PAGE_NAME, "${widget.planId}", "", ""); context, widget.PAGE_NAME, "${widget.planId}", "", "");
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 15), margin: EdgeInsets.only(left: 15,right: 15),
width: 135, width: ScreenUtil().setWidth(137),
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffF96079), color: Color(0xffF96079),
...@@ -588,12 +594,10 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -588,12 +594,10 @@ class LevelOneState extends BaseState<LevelOnePage>
alignment: Alignment.center, alignment: Alignment.center,
child: baseText("获取底价", 14, Colors.white, bold: true), child: baseText("获取底价", 14, Colors.white, bold: true),
)), )),
Expanded(
child: Container(),
)
], ],
), ),
)); );
} }
// Widget home() { // Widget home() {
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ e4a4ead0
...@@ -13,6 +13,7 @@ import 'package:flutter/cupertino.dart'; ...@@ -13,6 +13,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart'; import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart';
import 'package:flutter_screenutil/screenutil.dart';
import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart'; import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart'; import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart'; import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart';
...@@ -126,6 +127,11 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -126,6 +127,11 @@ class LevelTwoState extends BaseState<LevelTwoPage>
Expanded( Expanded(
child: newHomeWarp(), child: newHomeWarp(),
), ),
Container(
height: 0.5,
width: double.maxFinite,
color: Color(0xffE5E5E5),
),
bottomWidget(), bottomWidget(),
], ],
)), )),
...@@ -457,110 +463,103 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -457,110 +463,103 @@ class LevelTwoState extends BaseState<LevelTwoPage>
// 底部按钮 // 底部按钮
Widget bottomWidget() { Widget bottomWidget() {
return Align( return Container(
alignment: Alignment.bottomCenter, width: double.maxFinite,
child: Container( height: 55,
width: double.maxFinite, color: Colors.white,
height: 55, child: Row(
color: Colors.white, crossAxisAlignment: CrossAxisAlignment.center,
child: Row( children: <Widget>[
mainAxisSize: MainAxisSize.min, GestureDetector(
crossAxisAlignment: CrossAxisAlignment.center, behavior: HitTestBehavior.opaque,
children: <Widget>[ onTap: () {
GestureDetector( RouterCenterImpl().findMainRouter().jumpPage(
behavior: HitTestBehavior.opaque, context,
onTap: () { "level_two_plan_compare",
RouterCenterImpl().findMainRouter().jumpPage( {"planType": 2, "planId": widget.planId},
context, false);
"level_two_plan_compare", },
{"planType": 2, "planId": widget.planId}, child: Container(
false); margin: EdgeInsets.only(left: 21),
}, width: 30,
child: Container( child: Column(
margin: EdgeInsets.only(left: 18), mainAxisSize: MainAxisSize.min,
width: 30, children: <Widget>[
child: Column( Container(
mainAxisSize: MainAxisSize.min, width: 22,
children: <Widget>[ height: 22,
Container( child: Image.asset("assets/vs_black.png"),
width: 22,
height: 22,
child: Image.asset("assets/vs_black.png"),
),
Container(
margin: EdgeInsets.only(top: 3),
child: baseText("去比较", 10, Color(0xff282828)),
)
],
), ),
), Container(
margin: EdgeInsets.only(top: 3),
child: baseText("去比较", 10, Color(0xff282828)),
)
],
), ),
GestureDetector( ),
behavior: HitTestBehavior.opaque,
onTap: () {
if (CacheManager.getInstance()
.get(MEMORY_CACHE)
.get(USER_ID) ==
null &&
RouterCenterImpl().findMainRouter().isWithNative()) {
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "show_login", null, true);
return;
}
BaseBottomPicker()
..setPicker(MechanismBox(widget.planId))
..show(context);
},
child: Container(
margin: EdgeInsets.only(left: 15),
width: 135,
height: 40,
decoration: BoxDecoration(
color: Color(0xff51CDC7),
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("咨询", 14, Colors.white, bold: true),
)),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (CacheManager.getInstance()
.get(MEMORY_CACHE)
.get(USER_ID) ==
null &&
RouterCenterImpl().findMainRouter().isWithNative()) {
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "show_login", null, true);
return;
}
Map<String, dynamic> map = {
"page_name": "level_two_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
DiscussLowPricePopView.showPopView(
context, widget.PAGE_NAME, "${widget.planId}", "", "");
},
child: Container(
margin: EdgeInsets.only(left: 15),
width: 135,
height: 40,
decoration: BoxDecoration(
color: Color(0xffF96079),
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("获取底价", 14, Colors.white, bold: true),
)),
Expanded(
child: Container(),
)
],
), ),
)); GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (CacheManager.getInstance().get(MEMORY_CACHE).get(USER_ID) ==
null &&
RouterCenterImpl().findMainRouter().isWithNative()) {
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "show_login", null, true);
return;
}
BaseBottomPicker()
..setPicker(MechanismBox(widget.planId))
..show(context);
},
child: Container(
width: ScreenUtil().setWidth(137),
height: 40,
decoration: BoxDecoration(
color: Color(0xff51CDC7),
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("咨询", 14, Colors.white, bold: true),
)),
Expanded(
child: Container(),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (CacheManager.getInstance().get(MEMORY_CACHE).get(USER_ID) ==
null &&
RouterCenterImpl().findMainRouter().isWithNative()) {
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "show_login", null, true);
return;
}
Map<String, dynamic> map = {
"page_name": "level_two_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
DiscussLowPricePopView.showPopView(
context, widget.PAGE_NAME, "${widget.planId}", "", "");
},
child: Container(
margin: EdgeInsets.only(left: 15,right: 15),
width: ScreenUtil().setWidth(137),
height: 40,
decoration: BoxDecoration(
color: Color(0xffF96079),
borderRadius: BorderRadius.circular(20)),
alignment: Alignment.center,
child: baseText("获取底价", 14, Colors.white, bold: true),
)),
],
),
);
} }
} }
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