Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !18

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -15,10 +15,10 @@ import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/main.mark.dart';
 
 class DiscussLowPricePopView {
-  static void showPopView(
-      BuildContext content, String planId, String hospitalId, String doctorId) {
+  static void showPopView(BuildContext content, String pageName, String planId,
+      String hospitalId, String doctorId) {
     BaseCenterPicker()
-      ..setPicker(_PopView(planId, hospitalId, doctorId))
+      ..setPicker(_PopView(pageName, planId, hospitalId, doctorId))
       ..show(content);
   }
 }
@@ -27,7 +27,8 @@ class _PopView implements ICenterPicker {
   String planId;
   String hospitalId;
   String doctorId;
-  _PopView(this.planId, this.hospitalId, this.doctorId);
+  String pageName;
+  _PopView(this.pageName, this.planId, this.hospitalId, this.doctorId);
   VoidCallback dismissCallback;
   double contentWidth;
   DiscussLowPriceModel _model = new DiscussLowPriceModel();
@@ -45,7 +46,9 @@ class _PopView implements ICenterPicker {
           if (data.data.second == null || data.data.first == FAIL) {
             return errorItem(contentWidth, 308.5, () {});
           }
-          RouterCenterImpl().findMainRouter().buriedEvent("popup_view", {});
+          RouterCenterImpl()
+              .findMainRouter()
+              .buriedEvent("popup_view", phobosData());
           return Opacity(
               opacity: alp / 255.0,
               child: Container(
@@ -65,9 +68,6 @@ class _PopView implements ICenterPicker {
                           height: 13.5,
                           child: GestureDetector(
                             onTap: () {
-                              RouterCenterImpl()
-                                  .findMainRouter()
-                                  .buriedEvent("popup_view", {});
                               dismissCallback();
                             },
                             child: Image.asset(
@@ -177,6 +177,19 @@ class _PopView implements ICenterPicker {
         ]);
   }
 
+  Map<String, dynamic> phobosData() {
+    Map<String, dynamic> params = Map();
+    params['page_name'] = this.pageName;
+    if (this.hospitalId.length > 0) {
+      params['popup_name'] = 'interested_hospital';
+    } else if (this.doctorId.length > 0) {
+      params['popup_name'] = 'interested_doctor';
+    } else {
+      params['popup_name'] = 'interested_plan';
+    }
+    return params;
+  }
+
   @override
   void dispose() {
     _model.dispose();

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -442,4 +442,3 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
           ),
         ]));
   }
-}

lib/MainRouter/page/test/TestPage.dart

@@ -70,7 +70,7 @@ class TestState extends BaseState<TestPage> {
           RouterCenterImpl().findClueRouter().getTopPage({"rank_type": "0"}));
     }));
     list.add(listItem("弹窗", () {
-      DiscussLowPricePopView.showPopView(context, "1", "", "112");
+      DiscussLowPricePopView.showPopView(context, "hahaha", "1", "", "112");
     }));
     return list;
   }