Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !33

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -18,9 +18,15 @@ class LevelOneItem extends StatelessWidget {
   VoidCallback ask;
   Function(int planId) compare;
   Function(int planId) gotoPlan;
-
+  int position;
+  String tabName;
   LevelOneItem(this.cards,
-      {this.lowPrice, this.ask, this.compare, this.gotoPlan});
+      {this.lowPrice,
+      this.ask,
+      this.compare,
+      this.gotoPlan,
+      this.position,
+      this.tabName});
 
   @override
   Widget build(BuildContext context) {
@@ -61,6 +67,20 @@ class LevelOneItem extends StatelessWidget {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: () {
+        Map<String, dynamic> buriedMap;
+        buriedMap = {
+          "tab_name": tabName,
+          "position": position,
+          "card_id": cards.doctor.doctor_id,
+          "card_name": "card",
+          "card_type": "card",
+          "transaction_type": "",
+          "card_content_type": "doctor"
+        };
+        RouterCenterImpl()
+            .findMainRouter()
+            .buriedEvent("on_click_card", buriedMap);
+
         Map<String, dynamic> map = {
           "business_id": "${cards.doctor.doctor_id}",
         };
@@ -178,6 +198,19 @@ class LevelOneItem extends StatelessWidget {
     return GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
+          Map<String, dynamic> buriedMap;
+          buriedMap = {
+            "tab_name": tabName,
+            "position": position,
+            "card_id": cards.hospital.hosiptalId,
+            "card_name": "card",
+            "card_type": "card",
+            "transaction_type": "",
+            "card_content_type": "hospital"
+          };
+          RouterCenterImpl()
+              .findMainRouter()
+              .buriedEvent("on_click_card", buriedMap);
           Map<String, dynamic> map = {
             "business_id": "${cards.hospital.hosiptalId}",
           };
@@ -363,6 +396,20 @@ class LevelOneItem extends StatelessWidget {
         ],
       ),
     ).gestureDetector(() {
+      Map<String, dynamic> buriedMap;
+      buriedMap = {
+        "tab_name": tabName,
+        "position": position,
+        "card_id": cards.plan.plan_id,
+        "card_name": "card",
+        "card_type": "card",
+        "transaction_type": "",
+        "card_content_type": "level_two_plan"
+      };
+      RouterCenterImpl()
+          .findMainRouter()
+          .buriedEvent("on_click_card", buriedMap);
+
       Map<String, dynamic> map = {
         "business_id": "${cards.plan.plan_id}",
         "planId": cards.plan.plan_id

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -114,6 +114,18 @@ class LevelOneListState extends State<LevelOneList>
                                 .jumpPage(context, "show_login", null, true);
                             return;
                           }
+
+                          var data2 = _model.data[index];
+                          if (data2.cardType == "doctor") {
+                            buried_on_click_button(index, "bargain", "doctor",
+                                data2.doctor.doctor_id);
+                          } else if (data2.cardType == "hospital") {
+                            buried_on_click_button(index, "bargain", "hospital",
+                                data2.hospital.hosiptalId);
+                          } else if (data2.cardType == "plan") {
+                            buried_on_click_button(index, "bargain",
+                                "level_two_plan", "${data2.plan.plan_id}");
+                          }
                           DiscussLowPricePopView.showPopView(
                               context,
                               widget.pageName,
@@ -128,18 +140,41 @@ class LevelOneListState extends State<LevelOneList>
                         ask: () {
                           var data2 = _model.data[index];
                           if (data2.cardType == "doctor") {
+                            buried_on_click_button(index, "consult", "doctor",
+                                data2.doctor.doctor_id);
                             RouterCenterImpl().findMainRouter().jumpPage(
                                 context, data2.doctor.messageUrl, null, true);
                           } else if (data2.cardType == "hospital") {
+                            buried_on_click_button(index, "consult", "hospital",
+                                data2.hospital.hosiptalId);
                             RouterCenterImpl().findMainRouter().jumpPage(
                                 context, data2.hospital.messageUrl, null, true);
                           } else if (data2.cardType == "plan") {
+                            buried_on_click_button(index, "consult",
+                                "level_two_plan", "${data2.plan.plan_id}");
                             BaseBottomPicker()
                               ..setPicker(MechanismBox(data2.plan.plan_id))
                               ..show(context);
                           }
                         },
                         compare: (int planId) {
+                          var data2 = _model.data[index];
+                          if (data2.cardType == "doctor") {
+                            buried_on_click_button(index, "compare", "doctor",
+                                data2.doctor.doctor_id);
+                          } else if (data2.cardType == "hospital") {
+                            buried_on_click_button(index, "compare", "hospital",
+                                data2.hospital.hosiptalId);
+                          } else if (data2.cardType == "plan") {
+                            buried_on_click_button(index, "compare",
+                                "level_two_plan", "${data2.plan.plan_id}");
+                          }
+
+                          Map<String, dynamic> map = {
+                            "business_id": "${widget.planId}",
+                            "planId": planId,
+                            "planType": 2
+                          };
                           RouterCenterImpl().findMainRouter().jumpPage(
                               context,
                               widget.index == 0
@@ -148,6 +183,8 @@ class LevelOneListState extends State<LevelOneList>
                               {"planId": planId, "planType": 2},
                               false);
                         },
+                        tabName: _model.tab_type,
+                        position: index,
                       );
                     },
                     childCount: _model.data.length + 1,
@@ -184,6 +221,23 @@ class LevelOneListState extends State<LevelOneList>
     }, pullDown: false, pullUp: true, loadMoreColor: Color(0xffF7F6FA));
   }
 
+  buried_on_click_button(
+      int position, String btnName, String cardContentType, String cardId) {
+    Map<String, dynamic> buriedMap;
+    buriedMap = {
+      "tab_name": _model.tab_type,
+      "position": position,
+      "card_id": cardId,
+      "button_name": btnName,
+      "card_type": "card",
+      "transaction_type": "",
+      "card_content_type": cardContentType
+    };
+    RouterCenterImpl()
+        .findMainRouter()
+        .buriedEvent("on_click_button", buriedMap);
+  }
+
   @override
   bool get wantKeepAlive => true;
 }

lib/ClueModel/page/plan/PlanItem.dart

@@ -148,21 +148,14 @@ class PlanItem extends StatelessWidget {
           ),
         ).gestureDetector(() {
           Map<String, dynamic> map;
-          if (isPlanPage) {
-            map = {
-              "page_name": "plan_home",
-              "tab_name": "plan_home",
-              "referrer_id": "",
-              "referrer": "",
-              "position": pos,
-              "business_id": "",
-              "card_id": plans.id,
-              "card_type": "card",
-              "transaction_type": "",
-              "card_content_type": "level_one_plan"
-            };
-          }
-
+          map = {
+            "tab_name": isPlanPage ? "plan_home" : "",
+            "position": pos,
+            "card_id": plans.id,
+            "card_type": "card",
+            "transaction_type": "",
+            "card_content_type": "level_one_plan"
+          };
           RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map);
           Map<String, dynamic> buriedMap = {
             "business_id": "${plans.id}",

lib/ClueModel/page/top/TopModel.dart

@@ -42,9 +42,7 @@ class TopModel extends BaseModel {
     }
     Map<String, dynamic> map = {
       "page_name": "favor_plan",
-      "referrer": "plan_home",
-      "referrer": "plan_home",
-      "referrer_id": "",
+      "position": index,
       "referrer_link": ["plan_home"],
       "from_tab_name": tabs[tabIndex].name,
       "tab_name": tabs[index].name,