Merge branches 'test' and 'zcc/flutter' of…

Merge branches 'test' and 'zcc/flutter' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -140,15 +140,17 @@ class LevelOneListState extends State<LevelOneList>
                           }
                         },
                         compare: () {
+                          Map<String, dynamic> map = {
+                            "business_id": "${widget.planId}",
+                            "planId": widget.planId,
+                            "planType": widget.index == 0 ? 1 : 2
+                          };
                           RouterCenterImpl().findMainRouter().jumpPage(
                               context,
                               widget.index == 0
                                   ? "level_one_plan_compare"
                                   : "level_two_plan_compare",
-                              {
-                                "planId": widget.planId,
-                                "planType": widget.index == 0 ? 1 : 2
-                              },
+                              map,
                               false);
                         },
                       );

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -319,10 +319,9 @@ class LevelOneState extends BaseState<LevelOnePage>
                   child: baseText(
                       "${(_model.planoverItem.positiveRate.contains(".") ? _model.planoverItem.positiveRate.split(".")[0] : _model.planoverItem.positiveRate).replaceAll("%", "")}",
                       20,
-                      Color(0xffFF5963),
-                      bold: true),
+                      Color(0xffFF5963)),
                 ),
-                baseText("%", 10, Color(0xffFF5963)),
+                baseText("%", 11, Color(0xffFF5963)),
               ],
             ),
           ),
@@ -367,7 +366,7 @@ class LevelOneState extends BaseState<LevelOnePage>
                       fontSize: 14,
                       color: Color(0xff282828),
                       fontStyle: FontStyle.normal,
-                      fontWeight: FontWeight.w500),
+                      fontWeight: FontWeight.w400),
                 ),
               ),
               Container(
@@ -416,8 +415,7 @@ class LevelOneState extends BaseState<LevelOnePage>
   Widget explain() {
     List<Widget> list = [];
     list.add(Container(
-      height: 18,
-      margin: EdgeInsets.only(top: 0, bottom: 10),
+      height: 31,
       child: Row(
         children: <Widget>[
           baseText("项目说明", 15, Color(0xff282828)),
@@ -426,11 +424,13 @@ class LevelOneState extends BaseState<LevelOnePage>
           ),
           GestureDetector(
             onTap: () {
-              RouterCenterImpl().findMainRouter().jumpPage(
-                  context,
-                  "level_one_plan_instruction",
-                  {"planId": widget.planId},
-                  false);
+              Map<String, dynamic> map = {
+                "business_id": "${widget.planId}",
+                "planId": widget.planId
+              };
+              RouterCenterImpl()
+                  .findMainRouter()
+                  .jumpPage(context, "level_one_plan_instruction", map, false);
             },
             behavior: HitTestBehavior.opaque,
             child: baseText("了解更多", 12, Color(0xff3FB5AF)),
@@ -439,13 +439,9 @@ class LevelOneState extends BaseState<LevelOnePage>
       ),
     ));
     if (_model.planoverItem != null) {
-      int index = 0;
       _model.planoverItem.explanationAttrs.forEach((element) {
         list.add(Container(
-          margin: EdgeInsets.only(
-              bottom: index == _model.planoverItem.explanationAttrs.length - 1
-                  ? 0
-                  : 15),
+          margin: EdgeInsets.only(bottom: 15),
           child: Row(
             children: <Widget>[
               Container(
@@ -514,11 +510,14 @@ class LevelOneState extends BaseState<LevelOnePage>
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
-              RouterCenterImpl().findMainRouter().jumpPage(
-                  context,
-                  "level_two_plan_compare",
-                  {"planType": 1, "planId": widget.planId},
-                  false);
+              Map<String, dynamic> map = {
+                "business_id": "${widget.planId}",
+                "planId": widget.planId,
+                "planType": 1
+              };
+              RouterCenterImpl()
+                  .findMainRouter()
+                  .jumpPage(context, "level_two_plan_compare", map, false);
             },
             child: Container(
               margin: EdgeInsets.only(left: 21),
@@ -559,7 +558,6 @@ class LevelOneState extends BaseState<LevelOnePage>
               },
               child: Container(
                 width: ScreenUtil().setWidth(137),
-                margin: EdgeInsets.only(left: 20),
                 height: 40,
                 decoration: BoxDecoration(
                     color: Color(0xff51CDC7),
@@ -578,14 +576,6 @@ class LevelOneState extends BaseState<LevelOnePage>
                       .jumpPage(context, "show_login", null, true);
                   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(
                     context, widget.PAGE_NAME, "${widget.planId}", "", "");
               },

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -391,11 +391,13 @@ class LevelTwoState extends BaseState<LevelTwoPage>
           ),
           GestureDetector(
             onTap: () {
-              RouterCenterImpl().findMainRouter().jumpPage(
-                  context,
-                  "level_one_plan_instruction",
-                  {"planId": widget.planId},
-                  false);
+              Map<String, dynamic> map = {
+                "business_id": "${widget.planId}",
+                "planId": widget.planId,
+              };
+              RouterCenterImpl()
+                  .findMainRouter()
+                  .jumpPage(context, "level_one_plan_instruction", map, false);
             },
             behavior: HitTestBehavior.opaque,
             child: baseText("了解更多", 12, Color(0xff3FB5AF)),
@@ -471,11 +473,14 @@ class LevelTwoState extends BaseState<LevelTwoPage>
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
-              RouterCenterImpl().findMainRouter().jumpPage(
-                  context,
-                  "level_two_plan_compare",
-                  {"planType": 2, "planId": widget.planId},
-                  false);
+              Map<String, dynamic> map = {
+                "business_id": "${widget.planId}",
+                "planId": widget.planId,
+                "planType": 2
+              };
+              RouterCenterImpl()
+                  .findMainRouter()
+                  .jumpPage(context, "level_two_plan_compare", map, false);
             },
             child: Container(
               margin: EdgeInsets.only(left: 21),

lib/ClueModel/page/plan/PlanItem.dart

@@ -163,11 +163,14 @@ class PlanItem extends StatelessWidget {
           }
 
           RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map);
-          RouterCenterImpl().findMainRouter().jumpPage(
-              context,
-              "level_one_plan_detail",
-              {"planId": plans.id, "title": "${plans.name}"},
-              false);
+          Map<String, dynamic> buriedMap = {
+            "business_id": "${plans.id}",
+            "planId": plans.id,
+            "title": "${plans.name}"
+          };
+          RouterCenterImpl()
+              .findMainRouter()
+              .jumpPage(context, "level_one_plan_detail", buriedMap, false);
         }));
   }
 }

lib/ClueModel/page/plan/PlanPage.dart

@@ -202,7 +202,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                 leftPos: data.data[0],
                 topPos: data.data[1],
                 width: MediaQuery.of(context).size.width,
-                maxHeight: 45*_model.sortList.length,
+                maxHeight: 45 * _model.sortList.length,
                 listener: sortMenuListener,
                 child: SortView(_model.sortList, _model.sortPos, (index) {
                   clickIndexOther(1);
@@ -444,7 +444,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                       "rank_type": "0",
                       "id": "${data.data[0].id}",
                       "title": "${data.data[0].name}",
+                      "business_id": "${data.data[0].id}",
                     };
+
                     RouterCenterImpl()
                         .findMainRouter()
                         .jumpPage(context, "favor_plan", map, false);
@@ -473,7 +475,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                       "rank_type": "1",
                       "id": "${data.data[1].id}",
                       "title": "${data.data[1].name}",
+                      "business_id": "${data.data[1].id}",
                     };
+
                     RouterCenterImpl()
                         .findMainRouter()
                         .jumpPage(context, "hot_plan", map, false);

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;