Merge branch 'featrue/duxin' into 'test'

Featrue/duxin

See merge request !23

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -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';
@@ -119,15 +121,19 @@ class LevelOneState extends BaseState<LevelOnePage>
                           });
                           return completer.future;
                         },
-                      child: newHomeWarp()),
-                ), () {
+                        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

@@ -420,7 +420,16 @@ class LevelTwoState extends BaseState<LevelTwoPage>
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
-              Container(
+              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(
@@ -438,6 +447,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                     ],
                   ),
                 ),
+              ),
               GestureDetector(
                   behavior: HitTestBehavior.opaque,
                   onTap: () {
@@ -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

@@ -5,8 +5,8 @@
 class PlanOverViewBean {
   int error;
   String message;
-  Map extra;
-  Map errorExtra;
+  Null extra;
+  Null errorExtra;
   UserType userType;
   PlanOverData data;