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

lib/ClueModel/page/plan/PlanModel.dart

@@ -47,7 +47,6 @@ class PlanModel extends BaseModel {
     ClueApiImpl.getInstance()
         .getPlan(DioUtil.getInstance().getDio())
         .listen((event) {
-          print("ERROR12  ${event.error}");
           if (event.error == 0) {
             projectData = event.data.tags;
             sortList = event.data.orders;

lib/MainRouter/manager/JumpManager.dart

@@ -31,7 +31,7 @@ class JumpManager {
           "_gtid=3123e178b91a11eaa2d87e40d376ac134112; sessionid=pq9wf8equ4h26ia3yspzmquqn2rjs6mx; _gm_token=4091a81593419225");
       JumpUtil.jumpToPageRight(context, initMap(params)[pageNameWrap]);
     } else {
-      FlutterBoost.singleton.open(pageName, urlParams: params);
+      FlutterBoost.singleton.open(pageNameWrap, urlParams: params);
     }
   }
 
@@ -39,6 +39,8 @@ class JumpManager {
     return {
       "flutter://level_one_plan_detail":
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
+      "flutter://level_two_plan_deatil":
+      RouterCenterImpl().findClueRouter().getLevelTwoPage(params),
       "flutter://level_one_plan_instruction":
           RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
       "flutter://level_one_plan_compare":
@@ -50,9 +52,9 @@ class JumpManager {
           RouterCenterImpl().findClueRouter().getTopPage(params),
       "flutter://hot_plan":
           RouterCenterImpl().findClueRouter().getTopPage(params),
-      'level_one_plan_compare_detail':
+      'flutter://level_one_plan_compare_detail':
           RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
-      'level_two_plan_compare_deatil':
+      'flutter://level_two_plan_compare_deatil':
           RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
     };
   }

lib/MainRouter/page/test/TestPage.dart

@@ -26,23 +26,24 @@ class TestState extends BaseState<TestPage> {
       JumpUtil.jumpToPageRight(context, NetProxyPage());
     }));
     list.add(listItem("一级列表页", () {
-//      JumpUtil.jumpToPageRight(
-//          context, RouterCenterImpl().findClueRouter().getLevelOnePage({"planId":137}));
       RouterCenterImpl()
           .findMainRouter()
-          .jumpPage(context, "clueLevelOne", {"planId": 137}, false);
+          .jumpPage(context, "level_one_plan_detail", {"planId": 137}, false);
     }));
     list.add(listItem("二级列表页", () {
-      JumpUtil.jumpToPageRight(
-          context, RouterCenterImpl().findClueRouter().getLevelTwoPage({}));
+      RouterCenterImpl()
+          .findMainRouter()
+          .jumpPage(context, "level_two_plan_deatil", {"planId": 137}, false);
     }));
     list.add(listItem("方案页面", () {
-      JumpUtil.jumpToPageRight(
-          context, RouterCenterImpl().findClueRouter().getPlanPage());
+      RouterCenterImpl()
+          .findMainRouter()
+          .jumpPage(context, "plan_home", {"planId": 137}, false);
     }));
     list.add(listItem("对比详情页", () {
-      JumpUtil.jumpToPageRight(context,
-          RouterCenterImpl().findClueRouter().getPlanCompareDetailPage({}));
+      RouterCenterImpl()
+          .findMainRouter()
+          .jumpPage(context, "level_one_plan_compare_detail", {"planId": 137}, false);
     }));
     list.add(listItem("项目说明", () {
       JumpUtil.jumpToPageRight(

lib/commonModel/net/Api.dart

@@ -19,8 +19,8 @@ const String APP_HOST_RELEASE = "https://x6cgr5y5-gengmei.mock.coding.io";
  */
 //const String APP_HOST_DEBUG = "http://backend.paas-merchant.envs";
 //const String APP_HOST_DEBUG = "http://doctor.paas-merchant.env";
-const String APP_HOST_DEBUG = "https://x6cgr5y5-gengmei.mock.coding.io";
-//const String APP_HOST_DEBUG = "http://backend.paas-merchant.env";
+//const String APP_HOST_DEBUG = "https://x6cgr5y5-gengmei.mock.coding.io";
+const String APP_HOST_DEBUG = "http://backend.paas-merchant.env";
 //const String APP_HOST_DEBUG = "http://janus.paas-merchant.env";
 
 /**

lib/main.dart

@@ -91,7 +91,7 @@ class MyApp extends State<MyAppWidget> {
 
   @override
   Widget build(BuildContext context) {
-    WindowUtil.setBarStatus(false);
+    WindowUtil.setBarStatus(true);
     return MaterialApp(
         theme: ThemeData(
             primaryColor: Colors.white,