Merge branch 'featrue/duxin' into 'test'

二级方案

See merge request !24

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -488,7 +488,7 @@ class LevelOneState extends BaseState<LevelOnePage>
                   RouterCenterImpl().findMainRouter().jumpPage(
                       context,
                       "level_two_plan_compare",
-                      {"planType": 2, "planId": widget.planId},
+                      {"planType": 1, "planId": widget.planId},
                       false);
                 },
                 child: Container(
@@ -551,7 +551,7 @@ class LevelOneState extends BaseState<LevelOnePage>
                       return;
                     }
                     Map<String, dynamic> map = {
-                      "page_name": "level_two_plan_deatil",
+                      "page_name": "level_one_plan_deatil",
                       "referrer_link": [],
                       "popup_name": "interested_plan"
                     };

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -12,6 +12,7 @@ import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
 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/DiscussLowPrice/DiscussLowPricePopView.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';
@@ -510,6 +511,16 @@ class LevelTwoState extends BaseState<LevelTwoPage>
               GestureDetector(
                   behavior: HitTestBehavior.opaque,
                   onTap: () {
+                    if (CacheManager.getInstance()
+                                .get(MEMORY_CACHE)
+                                .get(USER_ID) ==
+                            null &&
+                        RouterCenterImpl().findMainRouter().isWithNative()) {
+                      RouterCenterImpl()
+                          .findMainRouter()
+                          .jumpPage(context, "show_login", null, true);
+                      return;
+                    }
                     Map<String, dynamic> map = {
                       "page_name": "level_two_plan_deatil",
                       "referrer_link": [],
@@ -518,6 +529,8 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                     RouterCenterImpl()
                         .findMainRouter()
                         .buriedEvent("popup_view", map);
+                    DiscussLowPricePopView.showPopView(
+                        context, widget.PAGE_NAME, "${widget.planId}", "", "");
                   },
                   child: Container(
                     margin: EdgeInsets.only(left: 15),