W

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailModel.dart

@@ -12,6 +12,7 @@ import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
 import 'package:flutter_common/commonModel/toast/NativeToast.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
+import 'package:gm_flutter/commonModel/util/PrintUtil.dart';
 
 class PlanCompareDetailModel extends BaseModel {
   LiveData<Pair<int, List<Groups>>> detailLive = LiveData();
@@ -43,7 +44,7 @@ class PlanCompareDetailModel extends BaseModel {
         .addToDispose(rxDispose)
         .onError((err) {
           stateLive.notifyView(FAIL);
-          NativeToast.showNativeToast(err.message);
+          PrintUtil.printBug(err);
         });
   }
 

lib/ClueModel/page/ProjectDetails/ProjectDetailsModel.dart

@@ -5,6 +5,7 @@
  **/
 import 'package:flutter_common/commonModel/live/BaseModel.dart';
 import 'package:flutter_common/commonModel/live/LiveData.dart';
+import 'package:flutter_common/commonModel/toast/NativeToast.dart';
 import 'package:gm_flutter/ClueModel/server/api/ClueApi.serv.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/rx/RxDispose.dart';
@@ -20,11 +21,15 @@ class ProjectDetailsModel extends BaseModel {
     ClueApiImpl.getInstance()
         .getProjectDetails(DioUtil.getInstance().getDio(), _planId)
         .listen((event) {
+          if (event.error != 0) {
+            NativeToast.showNativeToast(event.message);
+          }
           liveData.notifyView(event);
         })
         .addToDispose(rxDispose)
         .onError((err) {
           PrintUtil.printBug(err);
+          liveData.notifyView(ProjectDetailsItem()..error = -1);
         });
   }
 

lib/ClueModel/page/ProjectDetails/ProjectDetailsPage.dart

@@ -3,6 +3,8 @@
  * @date   2020-07-01
  * 项目说明
  **/
+import 'dart:ui';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_boost/flutter_boost.dart';
@@ -70,6 +72,14 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
           return Container();
         }
         ProjectDetailsItem item = data.data;
+        if (item == null || item.error != 0) {
+          return errorItem(MediaQuery.of(context).size.width,
+              MediaQuery.of(context).size.height, () {
+            _model.init(widget._planId);
+          },
+              paddingTop: MediaQueryData.fromWindow(window).padding.top +
+                  kToolbarHeight);
+        }
         if (item == null ||
             item.data == null ||
             item.data.groups == null ||

lib/ClueModel/page/levelOne/LevelOneList.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart';
+import 'package:flutter_common/commonModel/toast/NativeToast.dart';
 import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
 import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneListModel.dart';
 import 'package:gm_flutter/ClueModel/page/mechanismBox/MechanismBoxPage.dart';
@@ -140,11 +141,19 @@ class LevelOneListState extends State<LevelOneList>
                         ask: () {
                           var data2 = _model.data[index];
                           if (data2.cardType == "doctor") {
+                            if (!data2.doctor.accept_private_msg) {
+                              NativeToast.showNativeToast("该机构未开通私信功能");
+                              return;
+                            }
                             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") {
+                            if (!data2.hospital.accept_private_msg) {
+                              NativeToast.showNativeToast("该机构未开通私信功能");
+                              return;
+                            }
                             buried_on_click_button(index, "consult", "hospital",
                                 data2.hospital.hosiptalId);
                             RouterCenterImpl().findMainRouter().jumpPage(

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -438,9 +438,11 @@ class LevelOneState extends BaseState<LevelOnePage>
           child: Row(
             children: <Widget>[
               Container(
-                  constraints: BoxConstraints(
-                    maxWidth: 55,
-                  ),
+                  width: 55,
+//                  constraints: BoxConstraints(
+//                    maxWidth: 55,
+//                    minWidth: 50
+//                  ),
                   child: Text(
                     element.attrName.length == 2
                         ? "${element.attrName.substring(0, 1)}      ${element.attrName.substring(1, 2)}"

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -58,7 +58,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
 
   @override
   void initState() {
-    DioUtil.getInstance().setProxy('172.30.9.253');
+//    DioUtil.getInstance().setProxy('172.30.9.253');
     super.initState();
     _model.plan_id = widget.planId;
     _model.init(() {

lib/ClueModel/server/entity/LevelOneFeedList.dart

@@ -212,6 +212,7 @@ class Hospital {
   String messageUrl;
   bool isCheck = false;
   String gm_url;
+  bool accept_private_msg;
 
   Hospital(
       {this.portrait,
@@ -230,6 +231,7 @@ class Hospital {
     name = json['name'];
     minPrice = json['min_price'];
     maxPrice = json['max_price'];
+    accept_private_msg = json['accept_private_msg'];
     gm_url = json['gm_url'];
     star = json['star'];
     address = json['address'];
@@ -245,6 +247,7 @@ class Hospital {
     data['name'] = this.name;
     data['min_price'] = this.minPrice;
     data['max_price'] = this.maxPrice;
+    data['accept_private_msg'] = this.accept_private_msg;
     data['star'] = this.star;
     data['gm_url'] = this.gm_url;
     data['address'] = this.address;
@@ -265,6 +268,7 @@ class Doctor {
   String consultType;
   String messageUrl;
   String gm_url;
+  bool accept_private_msg;
 
   Doctor(
       {this.portrait,
@@ -287,6 +291,7 @@ class Doctor {
     title = json['title'];
     consultType = json['consult_type'];
     messageUrl = json['message_url'];
+    accept_private_msg = json['accept_private_msg'];
   }
 
   Map<String, dynamic> toJson() {
@@ -301,6 +306,7 @@ class Doctor {
     data['title'] = this.title;
     data['consult_type'] = this.consultType;
     data['message_url'] = this.messageUrl;
+    data['accept_private_msg'] = this.accept_private_msg;
     return data;
   }
 }

lib/ClueModel/server/entity/ProjectDetailsItem.dart

 class ProjectDetailsItem {
   int error;
   String message;
-  String extra;
-  String errorExtra;
+  Map extra;
+  Map errorExtra;
   UserType userType;
   Data data;
 

lib/MainRouter/manager/JumpManager.dart

@@ -25,6 +25,9 @@ class JumpManager {
     String pageNameWrap =
         nativePage ? "gm://${pageName}" : "flutter://${pageName}";
     if (!MainManager.getInstance().isInit) {
+      if (nativePage) {
+        return;
+      }
       JumpUtil.jumpToPageRight(context, initMap(params)[pageNameWrap]);
     } else {
       FlutterBoost.singleton.open(pageNameWrap, urlParams: params);
@@ -36,16 +39,17 @@ class JumpManager {
       "flutter://level_one_plan_detail":
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
       "flutter://level_two_plan_deatil":
-      RouterCenterImpl().findClueRouter().getLevelTwoPage(params),
+          RouterCenterImpl().findClueRouter().getLevelTwoPage(params),
       "flutter://level_one_plan_instruction":
           RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
       "flutter://level_two_plan_instruction":
-      RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
+          RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
       "flutter://level_one_plan_compare":
           RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
       "flutter://level_two_plan_compare":
-      RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
-      "flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(params),
+          RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
+      "flutter://plan_home":
+          RouterCenterImpl().findClueRouter().getPlanPage(params),
       "flutter://favor_plan":
           RouterCenterImpl().findClueRouter().getTopPage(params),
       "flutter://hot_plan":