commit

lib/ClueModel/ClueRouter.dart

@@ -18,7 +18,7 @@ abstract class ClueRouter implements RouterBaser {
 
   Widget getLevelTwoPage(Map<String, dynamic> params);
 
-  Widget getPlanPage();
+  Widget getPlanPage( Map<String, dynamic> params);
 
   Widget getPlanCompareDetailPage(Map<String, dynamic> params);
 

lib/ClueModel/ClueRouterImpl.dart

@@ -35,8 +35,8 @@ class ClueRouterImpl implements ClueRouter {
   }
 
   @override
-  Widget getPlanPage() {
-    return PlanPage();
+  Widget getPlanPage(Map<String, dynamic> params) {
+    return PlanPage(params);
   }
 
   @override

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -9,6 +9,7 @@ import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
 import 'package:gm_flutter/ClueModel/view/FiveStarView.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
+import 'package:gm_flutter/main.mark.dart';
 
 class LevelOneItem extends StatelessWidget {
   final Cards cards;
@@ -54,6 +55,12 @@ class LevelOneItem extends StatelessWidget {
       throw new Exception();
     }
     return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        RouterCenterImpl()
+            .findMainRouter()
+            .jumpPage(context, cards.doctor.messageUrl, {}, true);
+      },
       child: Container(
         margin: EdgeInsets.only(left: 15, right: 15),
         height: 127,
@@ -67,10 +74,16 @@ class LevelOneItem extends StatelessWidget {
                 child: ClipOval(
                   child: CachedNetworkImage(
                     imageUrl: cards.doctor.portrait,
+                    fit: BoxFit.cover,
                   ),
                 ),
               ),
             ),
+            Positioned(
+              left: 57,
+              top: 44,
+              child: FiveStarView(int.parse(cards.doctor.star), 5),
+            ),
             Positioned(
               left: 57,
               top: 18,
@@ -82,7 +95,7 @@ class LevelOneItem extends StatelessWidget {
                       bold: true),
                   Container(
                     margin: EdgeInsets.only(left: 4),
-                    child: baseText(cards.doctor.name, 15, Color(0xff333333),
+                    child: baseText(cards.doctor.title, 15, Color(0xff333333),
                         bold: true),
                   )
                 ],
@@ -111,11 +124,11 @@ class LevelOneItem extends StatelessWidget {
               right: 137,
               child: askWidget(),
             ),
-            Positioned(
-              left: 4.5,
-              bottom: 25,
-              child: compareWidget(),
-            ),
+//            Positioned(
+//              left: 4.5,
+//              bottom: 25,
+//              child: compareWidget(),
+//            ),
             Positioned(
               left: 0,
               bottom: 0,

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -4,6 +4,7 @@
  **/
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
 import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneListModel.dart';
 import 'package:gm_flutter/ClueModel/server/entity/LevelOneFeedList.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -49,6 +49,7 @@ class LevelOneState extends BaseState<LevelOnePage>
 
   @override
   void initState() {
+    DioUtil.getInstance().setProxy("172.30.8.245");
     super.initState();
     _model.plan_id = widget.planId;
     _model.init(() {

lib/ClueModel/page/plan/PlanPage.dart

@@ -34,6 +34,8 @@ import 'PlanModel.dart';
 import 'ProjectView.dart';
 
 class PlanPage extends StatefulWidget {
+  PlanPage(Map<String, dynamic> params) {}
+
   @override
   State<StatefulWidget> createState() => PlanState();
 }
@@ -388,7 +390,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                             data.data == null ? "" : data.data[0].icon ?? "",
                         fit: BoxFit.cover,
                       )).gestureDetector(() {
-                    Map<String, dynamic> map = {"rank_type": "0","wa":[1,2],"qew":["w",1]};
+                    Map<String, dynamic> map = {"rank_type": "0"};
                     RouterCenterImpl()
                         .findMainRouter()
                         .jumpPage(context, "favor_plan", map, false);
@@ -416,8 +418,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                     Map<String, dynamic> map = {"rank_type": "1"};
                     RouterCenterImpl()
                         .findMainRouter()
-//                        .jumpPage(context, "hot_plan", map, false);
-                        .jumpPage(context, "doctor_details", map, true);
+                        .jumpPage(context, "hot_plan", map, false);
                   });
                 },
               ),

lib/ClueModel/server/entity/LevelOneFeedList.dart

@@ -457,7 +457,7 @@ class TagsNewEra {
 }
 
 class User {
-  Null city;
+  String city;
   int userId;
   int topicNumPosted;
   int voteNumGained;

lib/ClueModel/server/entity/PlanBean.dart

@@ -21,8 +21,8 @@ class PlanBean {
   PlanBean.fromJson(Map<String, dynamic> json) {
     error = json['error'];
     message = json['message'];
-    extra = json['extra'];
-    errorExtra = json['error_extra'];
+    extra = json['extra']??"";
+    errorExtra = json['error_extra']??"";
     userType = json['user_type'] != null
         ? new UserType.fromJson(json['user_type'])
         : null;

lib/ClueModel/view/FiveStarView.dart

@@ -21,7 +21,7 @@ class FiveStarView extends StatelessWidget {
           width: 13,
           child: Image.asset(starAssets ?? "assets/sel_star.png"),
         ));
-        if (i != 0 && i != allStarCount - 1) {
+        if ( i != allStarCount - 1) {
           list.add(Container(
             height: 1,
             width: 2,
@@ -33,7 +33,7 @@ class FiveStarView extends StatelessWidget {
           width: 13,
           child: Image.asset("assets/normal_star.png"),
         ));
-        if (i != 0 && i != allStarCount - 1) {
+        if ( i != allStarCount - 1) {
           list.add(Container(
             height: 1,
             width: 2,

lib/MainRouter/manager/JumpManager.dart

@@ -47,7 +47,7 @@ class JumpManager {
           RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
       "flutter://level_two_plan_compare":
       RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
-      "flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(),
+      "flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(params),
       "flutter://favor_plan":
           RouterCenterImpl().findClueRouter().getTopPage(params),
       "flutter://hot_plan":

lib/MainRouter/page/test/TestPage.dart

@@ -25,6 +25,7 @@ class TestState extends BaseState<TestPage> {
     list.add(listItem("设置代理页面", () {
       JumpUtil.jumpToPageRight(context, NetProxyPage());
     }));
+
     list.add(listItem("一级列表页", () {
       RouterCenterImpl()
           .findMainRouter()
@@ -35,6 +36,11 @@ class TestState extends BaseState<TestPage> {
           .findMainRouter()
           .jumpPage(context, "level_two_plan_deatil", {"planId": 137}, false);
     }));
+    list.add(listItem("项目首页", () {
+      RouterCenterImpl()
+          .findMainRouter()
+          .jumpPage(context, "plan_home", {}, false);
+    }));
     list.add(listItem("方案页面", () {
       RouterCenterImpl()
           .findMainRouter()
@@ -49,13 +55,7 @@ class TestState extends BaseState<TestPage> {
           },
           false);
     }));
-    list.add(listItem("项目说明", () {
-      JumpUtil.jumpToPageRight(
-          context,
-          RouterCenterImpl()
-              .findClueRouter()
-              .getProjectDetailsPage({"planId": 1}));
-    }));
+
     list.add(listItem("方案对比", () {
       JumpUtil.jumpToPageRight(
           context,

lib/main.dart

@@ -59,7 +59,7 @@ class MyApp extends State<MyAppWidget> {
     super.initState();
     FlutterBoost.singleton.registerPageBuilders({
       'plan_home': (pageName, params, _) =>
-          RouterCenterImpl().findClueRouter().getPlanPage(),
+          RouterCenterImpl().findClueRouter().getPlanPage(params),
       'level_one_plan_detail': (pageName, params, _) =>
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
       'level_two_plan_deatil': (pageName, params, _) =>