Merge branch 'test' of git.wanmeizhensuo.com:linshengyu/gm_flutter into test

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -559,6 +559,7 @@ class LevelOneState extends BaseState<LevelOnePage>
               },
               child: Container(
                 width: ScreenUtil().setWidth(137),
+                margin: EdgeInsets.only(left: 20),
                 height: 40,
                 decoration: BoxDecoration(
                     color: Color(0xff51CDC7),

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -513,6 +513,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
               },
               child: Container(
                 width: ScreenUtil().setWidth(137),
+                margin: EdgeInsets.only(left: 20),
                 height: 40,
                 decoration: BoxDecoration(
                     color: Color(0xff51CDC7),
@@ -534,14 +535,6 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                       .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}", "", "");
               },

lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart

@@ -138,11 +138,11 @@ class MechanismBox implements IBottomPicker {
   // 弹窗标题
   Widget title(mq) {
     return Container(
-      margin: EdgeInsets.only(left: 20, right: 20),
+      margin: EdgeInsets.only(left: 15, right: 15),
       width: mq.size.width,
       decoration: BoxDecoration(
           border:
-              Border(bottom: BorderSide(width: 1, color: Color(0xffE5E5E5)))),
+              Border(bottom: BorderSide(width: .5, color: Color(0xffE5E5E5)))),
       height: 50,
       child: Stack(
         alignment: Alignment.center,
@@ -150,22 +150,19 @@ class MechanismBox implements IBottomPicker {
           Container(
             child: Text(
               '请选择要咨询的机构',
-              style: TextStyle(
-                  color: Color(0xff282828),
-                  fontSize: 17,
-                  fontWeight: FontWeight.bold),
+              style: TextStyle(color: Color(0xff282828), fontSize: 17),
             ),
           ),
           Positioned(
-              right: 0,
-              top: 16.0,
+              right: 5,
+              top: 16.5,
               child: GestureDetector(
                 onTap: () {
                   dismissCall();
                 },
                 child: Container(
-                  width: 14,
-                  height: 14,
+                  width: 13.5,
+                  height: 13.5,
                   child: Image.asset("assets/close-btn.png"),
                 ),
               ))
@@ -198,7 +195,7 @@ class MechanismBox implements IBottomPicker {
                         (BuildContext context, int index) {
                           if (index == _levelModel.data.length) {
                             return Container(
-                              height: 40,
+                              height: 0,
                               color: Color(0xffF7F6FA),
                             );
                           }
@@ -225,7 +222,6 @@ class MechanismBox implements IBottomPicker {
     return GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
-          print(hospital.toJson());
           if (doctor_ids.indexOf(hospital.doctorId) != -1) {
             doctor_ids.remove(hospital.doctorId);
           } else {
@@ -239,7 +235,7 @@ class MechanismBox implements IBottomPicker {
           height: 91.5,
           decoration: BoxDecoration(
               border: Border(
-                  bottom: BorderSide(width: 1, color: Color(0xffE5E5E5)))),
+                  bottom: BorderSide(width: .5, color: Color(0xffE5E5E5)))),
           child: Stack(
             children: <Widget>[
               Positioned(
@@ -265,9 +261,8 @@ class MechanismBox implements IBottomPicker {
               ),
               Positioned(
                 left: 89,
-                top: 15,
-                child:
-                    baseText(hospital.name, 15, Color(0xff333333), bold: true),
+                top: 16,
+                child: baseText(hospital.name, 15, Color(0xff333333)),
               ),
               Positioned(
                 top: 38,
@@ -278,12 +273,13 @@ class MechanismBox implements IBottomPicker {
                   children: <Widget>[
                     baseText("¥", 12, Color(0xffFF5963)),
                     baseText("${hospital.minPrice}-${hospital.maxPrice}", 15,
-                        Color(0xffFF5963)),
+                        Color(0xffFF5963),
+                        bold: true),
                   ],
                 ),
               ),
               Positioned(
-                bottom: 21,
+                bottom: 16,
                 left: 89,
                 child: Container(
                   width: 230,
@@ -292,7 +288,7 @@ class MechanismBox implements IBottomPicker {
               ),
               Positioned(
                 left: 89,
-                top: 38.5,
+                top: 40,
                 child: FiveStarView(int.parse(hospital.star), 5),
               )
             ],
@@ -399,12 +395,17 @@ class MechanismBox implements IBottomPicker {
                             }
                           }
                         },
-                        style: TextStyle(fontSize: 12),
+                        style:
+                            TextStyle(fontSize: 14, color: Color(0xff282828)),
                         maxLines: 1,
                         decoration: InputDecoration(
                             contentPadding: EdgeInsets.only(
-                                left: 16, top: 0, bottom: 12, right: 16),
+                                left: 16, top: 0, bottom: 11.5, right: 16),
                             hintText: '请输入您想了解的问题',
+                            hintStyle: TextStyle(
+                                color: Color(0xff999999),
+                                fontSize: 12,
+                                height: 2.2),
                             border: InputBorder.none));
                   },
                 ))

lib/ClueModel/page/top/TopModel.dart

@@ -40,16 +40,16 @@ class TopModel extends BaseModel {
     if (tabIndex == index) {
       return;
     }
-    tabIndex = index;
     Map<String, dynamic> map = {
       "page_name": "favor_plan",
       "referrer": "plan_home",
       "referrer": "plan_home",
       "referrer_id": "",
       "referrer_link": ["plan_home"],
-      "from_tab_name": "",
+      "from_tab_name": tabs[tabIndex].name,
       "tab_name": tabs[index].name,
     };
+    tabIndex = index;
     RouterCenterImpl().findMainRouter().buriedEvent("on_click_tab", map);
   }
 

lib/MainRouter/manager/MainManager.dart

@@ -10,7 +10,6 @@ import 'package:flutter_boost/flutter_boost.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
-import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 import '../../commonModel/App.dart';
@@ -119,20 +118,21 @@ class MainManager {
     }
   }
 
-//  void getInitParams(VoidCallback callback) {
-//    if (isInit) {
-//      if (flutterChannel != null) {
-//        flutterChannel.invokeMethod("get_common_params").then((data) {
-//          if (data is Map) {
-//            var map = Map<String, dynamic>.from(data);
-//            initParams(map, callback: callback);
-//          }
-//        }).whenComplete(() {
-////          callback();
-//        });
-//        return;
-//      }
-//    }
-//    callback();
-//  }
+  void getInitParams(VoidCallback callback) {
+    if (isInit) {
+      if (flutterChannel != null) {
+        flutterChannel.invokeMethod("get_common_params").then((data) {
+          if (data is Map) {
+            var map = Map<String, dynamic>.from(data);
+
+            initParams(map, callback: callback);
+          }
+        }).whenComplete(() {
+//          callback();
+        });
+        return;
+      }
+    }
+    callback();
+  }
 }