commit

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>[
@@ -79,15 +83,23 @@ class _PopView implements ICenterPicker {
                           decoration: BoxDecoration(boxShadow: [
                             BoxShadow(
                                 color: Colors.black12,
-                              offset: Offset(0.0, 15.0),
+                                offset: Offset(0.0, 3.0),
                                 blurRadius: 15.0,
                                 spreadRadius: 1.0)
                           ], shape: BoxShape.circle),
-                        child: ClipOval(
+                          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, align: 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/levelTwo/LevelTwoPage.dart

@@ -18,6 +18,7 @@ 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';
@@ -48,6 +49,7 @@ class LevelTwoState extends BaseState<LevelTwoPage>
 
   @override
   void initState() {
+    DioUtil.getInstance().setProxy("172.30.8.245");
     super.initState();
     _model.init(() {
       _initTabBar();

lib/commonModel/base/BaseComponent.dart

@@ -71,7 +71,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 +86,11 @@ 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 align}) {
   return Text(
     text,
+    textAlign: align ?? TextAlign.start,
     textScaleFactor: 1.0,
     style: TextStyle(
         decoration: TextDecoration.none,
@@ -474,8 +476,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 +487,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"),
-              )),
+          ),
         )),
   );
 }