Skip to content

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

Merge branch 'featrue/duxin' into 'test' 

Featrue/duxin

See merge request !23
parents 8b03e02d 09bcc457
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 35 deletions
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 1c8255da
......@@ -10,9 +10,11 @@ import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
as extend;
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.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/LevelOneModel.dart';
import 'package:gm_flutter/ClueModel/page/mechanismBox/MechanismBoxPage.dart';
import 'package:gm_flutter/commonModel/GMBase.dart';
import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
import 'package:gm_flutter/commonModel/base/BaseState.dart';
......@@ -108,26 +110,30 @@ class LevelOneState extends BaseState<LevelOnePage>
MediaQuery.of(context).size.height,
_model.stateLive,
Container(
child: BaseNestedScrollViewRefreshIndicator(
onRefresh: () async {
Completer completer = new Completer();
_model.init(() {
_initTabBar();
SimpleEventBus.instance()
.notifyListener("LevelOneList", "");
completer.complete();
});
return completer.future;
},
child: newHomeWarp()),
), () {
child: BaseNestedScrollViewRefreshIndicator(
onRefresh: () async {
Completer completer = new Completer();
_model.init(() {
_initTabBar();
SimpleEventBus.instance()
.notifyListener("LevelOneList", "");
completer.complete();
});
return completer.future;
},
child: Column(
children: <Widget>[
Expanded(
child: newHomeWarp(),
),
bottomWidget(),
],
))), () {
_model.stateLive.notifyView(LOADING);
_model.init(() {
_initTabBar();
});
},paddingTop: stateBarHeight+kToolbarHeight)
)
);
}, paddingTop: stateBarHeight + kToolbarHeight)));
}
Widget newHomeWarp() {
......@@ -462,6 +468,92 @@ class LevelOneState extends BaseState<LevelOnePage>
);
}
Widget bottomWidget() {
return Align(
alignment: Alignment.bottomCenter,
child: Container(
width: double.maxFinite,
height: 55,
color: Colors.white,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
RouterCenterImpl().findMainRouter().jumpPage(
context,
"level_two_plan_compare",
{"planType": 2, "planId": widget.planId},
false);
},
child: Container(
margin: EdgeInsets.only(left: 18),
width: 30,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
width: 22,
height: 22,
child: Image.asset("assets/vs_black.png"),
),
Container(
margin: EdgeInsets.only(top: 3),
child: baseText("去比较", 10, Color(0xff282828)),
)
],
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
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: () {
Map<String, dynamic> map = {
"page_name": "level_two_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
},
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(),
)
],
),
));
}
// Widget home() {
// return Column(
// children: <Widget>[
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 1c8255da
......@@ -420,22 +420,32 @@ class LevelTwoState extends BaseState<LevelTwoPage>
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 18),
width: 30,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
width: 22,
height: 22,
child: Image.asset("assets/vs_black.png"),
),
Container(
margin: EdgeInsets.only(top: 3),
child: baseText("去比较", 10, Color(0xff282828)),
)
],
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
RouterCenterImpl().findMainRouter().jumpPage(
context,
"level_two_plan_compare",
{"planType": 2, "planId": widget.planId},
false);
},
child: Container(
margin: EdgeInsets.only(left: 18),
width: 30,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
width: 22,
height: 22,
child: Image.asset("assets/vs_black.png"),
),
Container(
margin: EdgeInsets.only(top: 3),
child: baseText("去比较", 10, Color(0xff282828)),
)
],
),
),
),
GestureDetector(
......@@ -457,7 +467,16 @@ class LevelTwoState extends BaseState<LevelTwoPage>
)),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {},
onTap: () {
Map<String, dynamic> map = {
"page_name": "level_two_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
},
child: Container(
margin: EdgeInsets.only(left: 15),
width: 135,
......
lib/ClueModel/server/entity/PlanOverviewBean.dart
View file @ 1c8255da
......@@ -5,8 +5,8 @@
class PlanOverViewBean {
int error;
String message;
Map extra;
Map errorExtra;
Null extra;
Null errorExtra;
UserType userType;
PlanOverData data;
......
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