Merge branch 'test' of git.wanmeizhensuo.com:linshengyu/gm_flutter into zx/gmFlutter

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -28,7 +28,9 @@ class _PopView implements ICenterPicker {
   String hospitalId;
   String doctorId;
   String pageName;
+
   _PopView(this.pageName, this.planId, this.hospitalId, this.doctorId);
+
   VoidCallback dismissCallback;
   double contentWidth;
   DiscussLowPriceModel _model = new DiscussLowPriceModel();
@@ -53,7 +55,9 @@ class _PopView implements ICenterPicker {
               opacity: alp / 255.0,
               child: Container(
                 width: contentWidth,
-                height: 308.5,
+                height: _model.popViewLive.data.second.title.length > 13
+                    ? 357.5
+                    : 305.5,
                 child: Stack(
                     alignment: AlignmentDirectional.topCenter,
                     children: <Widget>[
@@ -74,21 +78,29 @@ class _PopView implements ICenterPicker {
                                 'assets/discuss_loe_price_cancel.png'),
                           )),
                       Container(
-                        width: 85,
-                        height: 85,
-                        decoration: BoxDecoration(boxShadow: [
-                          BoxShadow(
-                              color: Colors.black12,
-                              offset: Offset(0.0, 15.0),
-                              blurRadius: 15.0,
-                              spreadRadius: 1.0)
-                        ], shape: BoxShape.circle),
-                        child: ClipOval(
-                          child: Image.network(
-                              _model.popViewLive.data.second.icon,
-                              fit: BoxFit.cover),
-                        ),
-                      )
+                          width: 85,
+                          height: 85,
+                          decoration: BoxDecoration(boxShadow: [
+                            BoxShadow(
+                                color: Colors.black12,
+                                offset: Offset(0.0, 3.0),
+                                blurRadius: 15.0,
+                                spreadRadius: 1.0)
+                          ], shape: BoxShape.circle),
+                          child: Container(
+                            decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                            ),
+                            child: Image.network(
+                                _model.popViewLive.data.second.icon,
+                                fit: BoxFit.cover),
+                          )
+//                        ClipOval(
+//                          child: Image.network(
+//                              _model.popViewLive.data.second.icon,
+//                              fit: BoxFit.cover),
+//                        ),
+                          )
                     ]),
               ));
         });
@@ -96,7 +108,6 @@ class _PopView implements ICenterPicker {
 
   setupBodyView() {
     return Container(
-      height: 266,
       width: contentWidth,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(7),
@@ -112,6 +123,7 @@ class _PopView implements ICenterPicker {
 
   detailView() {
     return Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
@@ -136,10 +148,12 @@ class _PopView implements ICenterPicker {
                 ]),
           ),
           Container(
+              width: contentWidth,
+              alignment: Alignment.center,
               margin: EdgeInsets.only(bottom: 25),
               child: baseText(
                   _model.popViewLive.data.second.title, 18, Color(0xff464646),
-                  bold: true)),
+                  bold: true, textAlign: TextAlign.center)),
           Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(7),
@@ -171,7 +185,6 @@ class _PopView implements ICenterPicker {
             });
           }),
           Container(
-              width: contentWidth - 70,
               margin: EdgeInsets.only(bottom: 23.5),
               child: baseText('授权后，您的手机将以“虚拟号”方式提供给机构', 11, Color(0xff999999))),
         ]);

lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart

@@ -6,6 +6,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gm_flutter/ClueModel/server/entity/ProjectDetailsItem.dart';
+import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 
 class ProjectDetailsItemView extends StatelessWidget {
   Groups listData;
@@ -50,49 +51,25 @@ class ProjectDetailsItemView extends StatelessWidget {
       width: double.maxFinite,
       margin: EdgeInsets.only(bottom: 25, left: 15, right: 15),
       child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Container(
-            margin: EdgeInsets.only(right: 25.0),
-            alignment: Alignment.centerLeft,
-            width: 78,
-            child: baseText(attrs.attrName, 13, Color(0xFF999999)),
-          ),
+              margin: EdgeInsets.only(right: 25.0),
+              alignment: Alignment.centerLeft,
+              width: 78,
+              child: baseText(attrs.attrName, 13, Color(0xFF999999),
+                  textAlign: TextAlign.left,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis)),
           Expanded(
             child: Container(
                 alignment: Alignment.centerLeft,
-                child: Text(
-                  attrs.attrValue,
-                  textScaleFactor: 1.0,
-                  softWrap: true,
-                  style: TextStyle(
-                      decoration: TextDecoration.none,
-                      fontSize: 14,
-                      color: Color(0xFF282828),
-                      fontStyle: FontStyle.normal,
-                      fontWeight: FontWeight.w400),
-                )
-//              baseText(attrs.attrValue, 14, Color(0xFF282828))
-                ),
+                child: baseText(attrs.attrValue, 14, Color(0xFF282828),
+                    textAlign: TextAlign.left,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis)),
           ),
         ],
       ),
     );
   }
-
-  baseText(String text, double fontSize, Color color, {bool bold = false}) {
-    return Text(
-      text,
-      textScaleFactor: 1.0,
-      style: TextStyle(
-          decoration: TextDecoration.none,
-          fontSize: fontSize,
-          color: color,
-          fontStyle: FontStyle.normal,
-          fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
-      textAlign: TextAlign.left,
-      maxLines: 2,
-      overflow: TextOverflow.ellipsis,
-    );
-  }
 }

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

 /*
- * @author lsy
+ * @author dx
  * @date   2020/6/29
  **/
 import 'dart:async';
 import 'dart:math';
 import 'dart:ui';
 
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'
     as extend;
 import 'package:flutter/cupertino.dart';
@@ -18,14 +19,18 @@ import 'package:gm_flutter/ClueModel/page/mechanismBox/MechanismBoxPage.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
+import 'package:gm_flutter/commonModel/net/DioUtil.dart';
 import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
 import 'package:gm_flutter/main.mark.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class LevelTwoPage extends StatefulWidget {
+  int planId;
   final String PAGE_NAME = "level_two_plan_deatil";
 
-  LevelTwoPage(Map<String, dynamic> params) {}
+  LevelTwoPage(Map<String, dynamic> params) {
+    planId = params['planId'];
+  }
 
   @override
   State<StatefulWidget> createState() => LevelTwoState();
@@ -33,7 +38,6 @@ class LevelTwoPage extends StatefulWidget {
 
 class LevelTwoState extends BaseState<LevelTwoPage>
     with TickerProviderStateMixin {
-  int planId = 10;
   LevelOneModel _model = new LevelOneModel();
   RefreshController _refreshController = RefreshController();
   GlobalKey keyTop = new GlobalKey();
@@ -48,7 +52,9 @@ class LevelTwoState extends BaseState<LevelTwoPage>
 
   @override
   void initState() {
+    DioUtil.getInstance().setProxy("172.30.8.245");
     super.initState();
+    _model.plan_id = widget.planId;
     _model.init(() {
       _initTabBar();
     });
@@ -110,7 +116,14 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                         });
                         return completer.future;
                       },
-                      child: newHomeWarp()),
+                      child: Column(
+                        children: <Widget>[
+                          Expanded(
+                            child: newHomeWarp(),
+                          ),
+                          bottomWidget(),
+                        ],
+                      )),
                 ), () {
               _model.init(() {
                 _initTabBar();
@@ -162,7 +175,6 @@ class LevelTwoState extends BaseState<LevelTwoPage>
         baseSliverBack(() {
           Navigator.of(context).pop();
         }),
-        bottomWidget()
       ],
     );
   }
@@ -173,8 +185,8 @@ class LevelTwoState extends BaseState<LevelTwoPage>
     for (int i = 0; i < _model.tabsList.length; i++) {
       list.add(extend.NestedScrollViewInnerScrollPositionKeyWidget(
           Key("Tab${i}"),
-          LevelOneList(1,widget.PAGE_NAME,
-              planId, _model.tabsList[i].tabType, kToolbarHeight + d)));
+          LevelOneList(1, widget.PAGE_NAME, widget.planId,
+              _model.tabsList[i].tabType, kToolbarHeight + d)));
     }
     final double statusBarHeight = MediaQuery.of(context).padding.top;
     final double pinnedHeaderHeight = statusBarHeight + kToolbarHeight;
@@ -206,6 +218,17 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                 height: 40,
                 color: Colors.white,
                 child: baseTabBar(tabController, getTabs(), (index) {
+                  Map<String, dynamic> map = {};
+                  map["page_name"] = "level_two_plan_deatil";
+                  map["referrer"] = "";
+                  map["referrer_id"] = "";
+                  map["referrer_link"] = ["plan_home"];
+                  map["from_tab_name"] = "全部";
+                  map["tab_name"] = index == 0 ? '机构' : '医生';
+                  map["position"] = 1;
+                  RouterCenterImpl()
+                      .findMainRouter()
+                      .buriedEvent("on_click_tab", map);
                   _model.selectTab(index);
                 }, scroll: false),
               )),
@@ -232,7 +255,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
       );
     }
     return Padding(
-      padding: EdgeInsets.only(left: 15.0, right: 15.0, top: 8.0),
+      padding: EdgeInsets.only(left: 15.0, right: 15.0, top: 8.0, bottom: 20),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.max,
@@ -243,41 +266,43 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                 decoration: BoxDecoration(
                     borderRadius: BorderRadius.circular(17),
                     border: Border.all(color: Color(0xffF9F8FB), width: 1)),
-                child: Image.network(
-                  _model.planoverItem.banner.imageUrl,
+                child: CachedNetworkImage(
+                  imageUrl: _model.planoverItem.banner.imageUrl,
                   width: 86,
                   height: 86,
                   fit: BoxFit.cover,
                 ),
               )),
-          Padding(
-              padding: EdgeInsets.only(left: 12, top: 5),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisSize: MainAxisSize.max,
-                children: <Widget>[
-                  Text(_model.planoverItem.name,
-                      style: TextStyle(
-                          color: Color(0xff333333),
-                          fontSize: 15,
-                          fontWeight: FontWeight.bold)),
-                  Padding(padding: EdgeInsets.only(top: 5)),
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    verticalDirection: VerticalDirection.up,
-                    children: <Widget>[
-                      Text('指导价：',
-                          style: TextStyle(
-                              color: Color(0xff999999), fontSize: 12)),
-                      Text(
-                        '¥' + _model.planoverItem.guidePrice,
-                        style:
-                            TextStyle(color: Color(0xffFF5963), fontSize: 12),
-                      )
-                    ],
-                  )
-                ],
-              )),
+          Expanded(
+            child: Padding(
+                padding: EdgeInsets.only(left: 12, top: 5),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.max,
+                  children: <Widget>[
+                    Text(_model.planoverItem.name,
+                        style: TextStyle(
+                            color: Color(0xff333333),
+                            fontSize: 15,
+                            fontWeight: FontWeight.bold)),
+                    Padding(padding: EdgeInsets.only(top: 5)),
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      verticalDirection: VerticalDirection.up,
+                      children: <Widget>[
+                        Text('指导价：',
+                            style: TextStyle(
+                                color: Color(0xff999999), fontSize: 12)),
+                        Text(
+                          '¥' + _model.planoverItem.guidePrice,
+                          style:
+                              TextStyle(color: Color(0xffFF5963), fontSize: 12),
+                        )
+                      ],
+                    )
+                  ],
+                )),
+          )
         ],
       ),
     );

lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart

@@ -2,16 +2,25 @@ import 'package:cached_network_image/cached_network_image.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/levelOne/LevelOneListModel.dart';
+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/ClueModel/page/mechanismBox/MechanismModel.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
+import 'package:gm_flutter/main.mark.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class MechanismBox implements IBottomPicker {
   VoidCallback dismissCall;
   TextEditingController textController = TextEditingController();
   MechanismModel _model = new MechanismModel();
-  List<int> doctor_ids = new List();
+  List doctor_ids = new List();
+
+  LevelOneListModel _levelModel = LevelOneListModel();
+  RefreshController refreshController = RefreshController();
+
+  Function(String str) refresh;
 
   @required
   final int plan_id;
@@ -20,8 +29,27 @@ class MechanismBox implements IBottomPicker {
 
   @override
   initState(dismissCall, BuildContext context) {
+    Map<String, dynamic> map = {
+      "business_id": "level_two_plan_compare_deatil",
+      "page_name": "",
+      "referrer": "",
+      "referrer_id": "",
+      "referrer_link": [],
+      "referrer_tab_name": "",
+      "in": "",
+      "out": "",
+      "is_push": 1,
+      "fake": 1,
+      "is_first": 1
+    };
+    RouterCenterImpl().findMainRouter().buriedEvent("page_view", map);
     this.dismissCall = dismissCall;
     _model.getQuestions(plan_id);
+    _levelModel.refreshView(true);
+    refresh = (str) {
+      _levelModel.stateLive.notifyView(LOADING);
+      _levelModel.refreshView(true);
+    };
   }
 
   Widget build(BuildContext context) {
@@ -56,6 +84,9 @@ class MechanismBox implements IBottomPicker {
   @override
   void dispose() {
     textController.dispose();
+    refreshController.dispose();
+    _levelModel.dispose();
+    _model.dispose();
   }
 
   setupHome(mq, keyHeight) {
@@ -114,21 +145,64 @@ class MechanismBox implements IBottomPicker {
         height: mq.size.height - 140 - 96 - 50 - keyHeight,
         width: mq.size.width,
         padding: EdgeInsets.only(left: 15, right: 15),
-        child: ListView.separated(
-          itemCount: 100,
-          itemBuilder: (BuildContext context, int index) {
-            return HospitalItem(context, index);
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return Divider(color: Color(0xffE5E5E5));
-          },
-        ));
+        child: baseRefreshView(refreshController, () {}, null, null,
+            customScrollView: CustomScrollView(
+//          physics: NeverScrollableScrollPhysics(),
+              physics: ClampingScrollPhysics(),
+//          shrinkWrap: true,
+              slivers: <Widget>[
+//            SliverOverlapInjector(
+//              handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
+//            ),
+                StreamBuilder<List<Cards>>(
+                  stream: _levelModel.cardsLive.stream,
+                  initialData: _levelModel.cardsLive.data ?? [],
+                  builder: (c, data) {
+                    if (data.data.isEmpty && _levelModel.page > 1) {
+                      refreshController.loadNoData();
+                    } else {
+                      refreshController.loadComplete();
+                    }
+                    return SliverList(
+                      delegate: SliverChildBuilderDelegate(
+                        (BuildContext context, int index) {
+                          if (index == _levelModel.data.length) {
+                            return Container(
+                              height: 40,
+                              color: Color(0xffF7F6FA),
+                            );
+                          }
+                          if (_levelModel.data[index].cardType == 'hospital') {
+                            Hospital hospital =
+                                _levelModel.data[index].hospital;
+                            return HospitalItem(hospital);
+                          } else {
+                            return Container();
+                          }
+                        },
+                        childCount: _levelModel.data.length + 1,
+                      ),
+                    );
+                  },
+                ),
+              ],
+            ), onLoading: () {
+          _levelModel.loadMore();
+        }, pullDown: false, pullUp: true));
   }
 
   // 机构卡片
-  Widget HospitalItem(BuildContext context, int index) {
+  Widget HospitalItem(Hospital hospital) {
     return GestureDetector(
-        onTap: () {},
+        onTap: () {
+          if (doctor_ids.indexOf(hospital.hosiptalId) != -1) {
+            doctor_ids.remove(hospital.hosiptalId);
+          } else {
+            doctor_ids.add(hospital.hosiptalId);
+          }
+          hospital.isCheck = !hospital.isCheck;
+          _levelModel.cardsLive.notifyView(_levelModel.cardsLive.data);
+        },
         child: Container(
           height: 94.5,
           child: Stack(
@@ -139,7 +213,7 @@ class MechanismBox implements IBottomPicker {
                   child: Container(
                     height: 17,
                     width: 17,
-                    child: true
+                    child: hospital.isCheck
                         ? Image.asset("assets/icon-checked.png")
                         : Image.asset("assets/icon-check.png"),
                   )),
@@ -151,10 +225,8 @@ class MechanismBox implements IBottomPicker {
                   height: 45,
                   child: ClipOval(
                     child: CachedNetworkImage(
-                      // imageUrl: cards.hospital.portrait,
-                      imageUrl:
-                          'https://img1.gamersky.com/image2019/07/20190725_ll_red_136_2/gamersky_07small_14_201972510258D0.jpg',
-                    ),
+                        // imageUrl: cards.hospital.portrait,
+                        imageUrl: hospital.portrait),
                   ),
                 ),
               ),
@@ -163,7 +235,8 @@ class MechanismBox implements IBottomPicker {
                 top: 17.5,
                 // child: baseText(cards.hospital.name, 15, Color(0xff333333),
                 //     bold: true),
-                child: baseText('22222', 15, Color(0xff333333), bold: true),
+                child:
+                    baseText(hospital.name, 15, Color(0xff333333), bold: true),
               ),
               Positioned(
                 top: 42.5,
@@ -173,7 +246,8 @@ class MechanismBox implements IBottomPicker {
                   mainAxisSize: MainAxisSize.min,
                   children: <Widget>[
                     baseText("¥", 12, Color(0xffFF5963)),
-                    baseText("${1}-${2}", 15, Color(0xffFF5963)),
+                    baseText("${hospital.minPrice}-${hospital.maxPrice}", 15,
+                        Color(0xffFF5963)),
                   ],
                 ),
               ),
@@ -181,12 +255,12 @@ class MechanismBox implements IBottomPicker {
                 bottom: 21,
                 left: 89,
                 // child: baseText(cards.hospital.address, 12, Color(0xff666666)),
-                child: baseText('dsssssssss', 12, Color(0xff666666)),
+                child: baseText(hospital.address, 12, Color(0xff666666)),
               ),
               Positioned(
                 left: 89,
                 top: 38.5,
-                child: FiveStarView(2, 5),
+                child: FiveStarView(int.parse(hospital.star), 5),
               )
             ],
           ),
@@ -276,17 +350,17 @@ class MechanismBox implements IBottomPicker {
                         keyboardType: TextInputType.text,
                         textInputAction: TextInputAction.send,
                         onSubmitted: (txt) {
-                          if (!(doctor_ids.length > 3 ||
-                              doctor_ids.length < 1)) {
+                          if (doctor_ids.length > 3 || doctor_ids.length < 1) {
                             NativeToast.showNativeToast('请选择1-3个机构咨询');
                           } else {
-                            if (txt == '') {
-                              NativeToast.showNativeToast('text');
-                            } else {
-                              _model.sendMessage(doctor_ids, txt, plan_id);
-                              dismissCall();
-                              textController.text = '';
-                              NativeToast.showNativeToast('消息已发送成功');
+                            if (txt != '') {
+                              _model.sendMessage(doctor_ids, txt, plan_id, (i) {
+                                if (i == 0) {
+                                  dismissCall();
+                                  textController.text = '';
+                                  NativeToast.showNativeToast('消息已发送成功');
+                                }
+                              });
                             }
                           }
                         },

lib/ClueModel/page/mechanismBox/MechanismModel.dart

@@ -42,12 +42,14 @@ class MechanismModel extends BaseModel {
         });
   }
 
-  sendMessage(List<int> doctor_ids, String question, int plan_id) {
+  sendMessage(List<int> doctor_ids, String question, int plan_id,
+      Function(int state) func) {
     ClueApiImpl.getInstance()
         .sendMessage(
             DioUtil.getInstance().getDio(), doctor_ids, question, plan_id)
         .listen((event) {
           if (event.error == 0) {
+            func(0);
             messageLive.notifyView(event.data.success);
           } else {
             NativeToast.showNativeToast(event.message);

lib/ClueModel/server/entity/LevelOneFeedList.dart

@@ -10,14 +10,22 @@ class LevelOneFeedList {
   UserType userType;
   Data data;
 
-  LevelOneFeedList({this.error, this.message, this.extra, this.errorExtra, this.userType, this.data});
+  LevelOneFeedList(
+      {this.error,
+      this.message,
+      this.extra,
+      this.errorExtra,
+      this.userType,
+      this.data});
 
   LevelOneFeedList.fromJson(Map<String, dynamic> json) {
     error = json['error'];
     message = json['message'];
     extra = json['extra'];
     errorExtra = json['error_extra'];
-    userType = json['user_type'] != null ? new UserType.fromJson(json['user_type']) : null;
+    userType = json['user_type'] != null
+        ? new UserType.fromJson(json['user_type'])
+        : null;
     data = json['data'] != null ? new Data.fromJson(json['data']) : null;
   }
 
@@ -38,17 +46,14 @@ class LevelOneFeedList {
 }
 
 class UserType {
-
-
   UserType();
 
-UserType.fromJson(Map<String, dynamic> json) {
-}
+  UserType.fromJson(Map<String, dynamic> json) {}
 
-Map<String, dynamic> toJson() {
-  final Map<String, dynamic> data = new Map<String, dynamic>();
-  return data;
-}
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    return data;
+  }
 }
 
 class Data {
@@ -59,7 +64,9 @@ class Data {
   Data.fromJson(Map<String, dynamic> json) {
     if (json['cards'] != null) {
       cards = new List<Cards>();
-      json['cards'].forEach((v) { cards.add(new Cards.fromJson(v)); });
+      json['cards'].forEach((v) {
+        cards.add(new Cards.fromJson(v));
+      });
     }
   }
 
@@ -84,8 +91,11 @@ class Cards {
   Cards.fromJson(Map<String, dynamic> json) {
     cardType = json['card_type'];
     plan = json['plan'] != null ? new Plan.fromJson(json['plan']) : null;
-    hospital = json['hospital'] != null ? new Hospital.fromJson(json['hospital']) : null;
-    doctor = json['doctor'] != null ? new Doctor.fromJson(json['doctor']) : null;
+    hospital = json['hospital'] != null
+        ? new Hospital.fromJson(json['hospital'])
+        : null;
+    doctor =
+        json['doctor'] != null ? new Doctor.fromJson(json['doctor']) : null;
     diary = json['diary'] != null ? new Diary.fromJson(json['diary']) : null;
   }
 
@@ -119,7 +129,16 @@ class Plan {
   String consultType;
   String messageUrl;
 
-  Plan({this.planName, this.minPrice, this.maxPrice, this.positiveRate, this.salesCount, this.baseAttrs, this.projectImage, this.consultType, this.messageUrl});
+  Plan(
+      {this.planName,
+      this.minPrice,
+      this.maxPrice,
+      this.positiveRate,
+      this.salesCount,
+      this.baseAttrs,
+      this.projectImage,
+      this.consultType,
+      this.messageUrl});
 
   Plan.fromJson(Map<String, dynamic> json) {
     planName = json['plan_name'];
@@ -129,7 +148,9 @@ class Plan {
     salesCount = json['sales_count'];
     if (json['base_attrs'] != null) {
       baseAttrs = new List<BaseAttrs>();
-      json['base_attrs'].forEach((v) { baseAttrs.add(new BaseAttrs.fromJson(v)); });
+      json['base_attrs'].forEach((v) {
+        baseAttrs.add(new BaseAttrs.fromJson(v));
+      });
     }
     projectImage = json['project_image'];
     consultType = json['consult_type'];
@@ -174,6 +195,7 @@ class BaseAttrs {
 
 class Hospital {
   String portrait;
+  String hosiptalId;
   String name;
   String minPrice;
   String maxPrice;
@@ -181,11 +203,21 @@ class Hospital {
   String address;
   String consultType;
   String messageUrl;
-
-  Hospital({this.portrait, this.name, this.minPrice, this.maxPrice, this.star, this.address, this.consultType, this.messageUrl});
+  bool isCheck = false;
+
+  Hospital(
+      {this.portrait,
+      this.name,
+      this.minPrice,
+      this.maxPrice,
+      this.star,
+      this.address,
+      this.consultType,
+      this.messageUrl});
 
   Hospital.fromJson(Map<String, dynamic> json) {
     portrait = json['portrait'];
+    hosiptalId = json['hosiptal_id'];
     name = json['name'];
     minPrice = json['min_price'];
     maxPrice = json['max_price'];
@@ -198,6 +230,7 @@ class Hospital {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     data['portrait'] = this.portrait;
+    data['hosiptal_id'] = this.hosiptalId;
     data['name'] = this.name;
     data['min_price'] = this.minPrice;
     data['max_price'] = this.maxPrice;
@@ -219,7 +252,15 @@ class Doctor {
   String consultType;
   String messageUrl;
 
-  Doctor({this.portrait, this.name, this.minPrice, this.maxPrice, this.star, this.title, this.consultType, this.messageUrl});
+  Doctor(
+      {this.portrait,
+      this.name,
+      this.minPrice,
+      this.maxPrice,
+      this.star,
+      this.title,
+      this.consultType,
+      this.messageUrl});
 
   Doctor.fromJson(Map<String, dynamic> json) {
     portrait = json['portrait'];
@@ -285,7 +326,44 @@ class Diary {
   UserLevel userLevel;
   int serviceId;
 
-  Diary({this.diaryNum, this.videoUrl, this.isIdentification, this.isLiked, this.titleStyleType, this.replyNum, this.lasestTopicCreatedTime, this.images, this.relationServiceSku, this.createdTime, this.latestTopicId, this.id, this.city, this.userId, this.title, this.isVoted, this.diaryId, this.preImageList, this.voteNum, this.tagsNewEra, this.content, this.videoPic, this.shortVideoUrl, this.diaryAmount, this.diaryTitle, this.authorType, this.tags, this.contentLevel, this.lastModified, this.user, this.isOnline, this.date, this.membershipLevel, this.viewNum, this.postImageList, this.userLevel, this.serviceId});
+  Diary(
+      {this.diaryNum,
+      this.videoUrl,
+      this.isIdentification,
+      this.isLiked,
+      this.titleStyleType,
+      this.replyNum,
+      this.lasestTopicCreatedTime,
+      this.images,
+      this.relationServiceSku,
+      this.createdTime,
+      this.latestTopicId,
+      this.id,
+      this.city,
+      this.userId,
+      this.title,
+      this.isVoted,
+      this.diaryId,
+      this.preImageList,
+      this.voteNum,
+      this.tagsNewEra,
+      this.content,
+      this.videoPic,
+      this.shortVideoUrl,
+      this.diaryAmount,
+      this.diaryTitle,
+      this.authorType,
+      this.tags,
+      this.contentLevel,
+      this.lastModified,
+      this.user,
+      this.isOnline,
+      this.date,
+      this.membershipLevel,
+      this.viewNum,
+      this.postImageList,
+      this.userLevel,
+      this.serviceId});
 
   Diary.fromJson(Map<String, dynamic> json) {
     diaryNum = json['diary_num'];
@@ -297,9 +375,13 @@ class Diary {
     lasestTopicCreatedTime = json['lasest_topic_created_time'];
     if (json['images'] != null) {
       images = new List<Images>();
-      json['images'].forEach((v) { images.add(new Images.fromJson(v)); });
+      json['images'].forEach((v) {
+        images.add(new Images.fromJson(v));
+      });
     }
-    relationServiceSku = json['relation_service_sku'] != null ? new UserType.fromJson(json['relation_service_sku']) : null;
+    relationServiceSku = json['relation_service_sku'] != null
+        ? new UserType.fromJson(json['relation_service_sku'])
+        : null;
     createdTime = json['created_time'];
     latestTopicId = json['latest_topic_id'];
     id = json['id'];
@@ -312,7 +394,9 @@ class Diary {
     voteNum = json['vote_num'];
     if (json['tags_new_era'] != null) {
       tagsNewEra = new List<TagsNewEra>();
-      json['tags_new_era'].forEach((v) { tagsNewEra.add(new TagsNewEra.fromJson(v)); });
+      json['tags_new_era'].forEach((v) {
+        tagsNewEra.add(new TagsNewEra.fromJson(v));
+      });
     }
     content = json['content'];
     videoPic = json['video_pic'];
@@ -322,7 +406,9 @@ class Diary {
     authorType = json['author_type'];
     if (json['tags'] != null) {
       tags = new List<Tags>();
-      json['tags'].forEach((v) { tags.add(new Tags.fromJson(v)); });
+      json['tags'].forEach((v) {
+        tags.add(new Tags.fromJson(v));
+      });
     }
     contentLevel = json['content_level'];
     lastModified = json['last_modified'];
@@ -332,7 +418,9 @@ class Diary {
     membershipLevel = json['membership_level'];
     viewNum = json['view_num'];
     postImageList = json['post_image_list'].cast<String>();
-    userLevel = json['user_level'] != null ? new UserLevel.fromJson(json['user_level']) : null;
+    userLevel = json['user_level'] != null
+        ? new UserLevel.fromJson(json['user_level'])
+        : null;
     serviceId = json['service_id'];
   }
 
@@ -402,7 +490,16 @@ class Images {
   String imageHalf;
   String desc;
 
-  Images({this.imageWide, this.imageType, this.image, this.sImagePlatform, this.imageSlimwidth, this.smallWide, this.imageThumb, this.imageHalf, this.desc});
+  Images(
+      {this.imageWide,
+      this.imageType,
+      this.image,
+      this.sImagePlatform,
+      this.imageSlimwidth,
+      this.smallWide,
+      this.imageThumb,
+      this.imageHalf,
+      this.desc});
 
   Images.fromJson(Map<String, dynamic> json) {
     imageWide = json['image_wide'];
@@ -465,7 +562,14 @@ class User {
   String userName;
   String membershipLevel;
 
-  User({this.city, this.userId, this.topicNumPosted, this.voteNumGained, this.portrait, this.userName, this.membershipLevel});
+  User(
+      {this.city,
+      this.userId,
+      this.topicNumPosted,
+      this.voteNumGained,
+      this.portrait,
+      this.userName,
+      this.membershipLevel});
 
   User.fromJson(Map<String, dynamic> json) {
     city = json['city'];
@@ -536,4 +640,3 @@ class Tags {
     return data;
   }
 }
-

lib/MainRouter/page/test/TestPage.dart

@@ -36,7 +36,7 @@ class TestState extends BaseState<TestPage> {
     list.add(listItem("二级列表页", () {
       RouterCenterImpl()
           .findMainRouter()
-          .jumpPage(context, "level_two_plan_deatil", {"planId": 137}, false);
+          .jumpPage(context, "level_two_plan_deatil", {"planId": 192}, false);
     }));
     list.add(listItem("项目首页", () {
       RouterCenterImpl()

lib/commonModel/base/BaseComponent.dart

@@ -4,18 +4,11 @@
  **/
 
 import 'package:app_settings/app_settings.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_common/commonModel/eventbus/GlobalEventBus.dart';
 import 'package:flutter_common/commonModel/live/LiveData.dart';
-import 'package:flutter_common/commonModel/view/iOSLoading.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
-import 'package:gm_flutter/commonModel/view/ImagesAnimation.dart';
-import 'package:gm_flutter/commonModel/view/baseRefreshIndicator.dart';
 import 'package:gm_flutter/commonModel/view/baseTabIndicator.dart';
 import 'package:lottie/lottie.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -71,7 +64,7 @@ AppBar _baseAppBarChangeTitle(
                 tag: "left_arrow",
                 child: Container(
                     alignment: Alignment.centerLeft,
-                    margin: EdgeInsets.only(left: 10),
+                    margin: EdgeInsets.only(left: 7),
                     child: Container(
                       width: 30,
                       height: 30,
@@ -86,9 +79,14 @@ AppBar _baseAppBarChangeTitle(
   );
 }
 
-Text baseText(String text, double fontSize, Color color, {bool bold = false}) {
+Text baseText(String text, double fontSize, Color color,
+    {bool bold = false,
+    TextAlign textAlign,
+    int maxLines = 1,
+    TextOverflow overflow}) {
   return Text(
     text,
+    textAlign: textAlign ?? TextAlign.start,
     textScaleFactor: 1.0,
     style: TextStyle(
         decoration: TextDecoration.none,
@@ -96,6 +94,8 @@ Text baseText(String text, double fontSize, Color color, {bool bold = false}) {
         color: color,
         fontStyle: FontStyle.normal,
         fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
+    maxLines: maxLines,
+    overflow: overflow == null ? TextOverflow.ellipsis : overflow,
   );
 }
 
@@ -474,8 +474,8 @@ Widget baseSliverAppBar(String url,
 
 Widget baseSliverBack(VoidCallback tap) {
   return Positioned(
-    top: 49,
-    left: 15,
+    top: 40,
+    left: 7,
     child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: tap,
@@ -485,11 +485,9 @@ Widget baseSliverBack(VoidCallback tap) {
           decoration:
               BoxDecoration(color: Color(0x99FFFFFF), shape: BoxShape.circle),
           alignment: Alignment.center,
-          child: Hero(
-              tag: "left_arrow",
-              child: Container(
-                child: Image.asset("assets/left_arrow.png"),
-              )),
+          child: Container(
+            child: Image.asset("assets/left_arrow.png"),
+          ),
         )),
   );
 }

lib/commonModel/net/Api.dart

@@ -19,7 +19,7 @@ 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 = "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/commonModel/net/DioUtil.dart

@@ -46,14 +46,14 @@ class DioUtil {
     DioCookieManager.getInstance().clearCookie();
   }
 
-  void setProxy(String proxy) {
+  void setProxy(String proxy, {String port}) {
     _dio = new Dio(_options);
     _dio.interceptors.add(DioInterceptorManager.getInstance().getIntercept());
     _dio.interceptors.add(DioCookieManager.getInstance().getCookieManager());
     (_dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate =
         (client) {
       client.findProxy = (url) {
-        return 'PROXY $proxy:8888';
+        return 'PROXY $proxy:${port??8888}';
       };
     };
   }