Merge branch 'featrue/duxin' of…

Merge branch 'featrue/duxin' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into featrue/duxin

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -80,7 +80,7 @@ class LevelOneItem extends StatelessWidget {
         };
         RouterCenterImpl()
             .findMainRouter()
-            .jumpPage(context, cards.doctor.messageUrl, map, true);
+            .jumpPage(context, cards.doctor.gm_url, map, true);
       },
       child: Container(
         margin: EdgeInsets.only(left: 15, right: 15),
@@ -107,7 +107,7 @@ class LevelOneItem extends StatelessWidget {
             ),
             Positioned(
               left: 57,
-              top: 18,
+              top: 17,
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.baseline,
@@ -117,8 +117,7 @@ class LevelOneItem extends StatelessWidget {
                       bold: true),
                   Container(
                     margin: EdgeInsets.only(left: 4),
-                    child: baseText(cards.doctor.title, 13, Color(0xff999999),
-                        bold: true),
+                    child: baseText(cards.doctor.title, 13, Color(0xff999999)),
                   )
                 ],
               ),
@@ -210,7 +209,7 @@ class LevelOneItem extends StatelessWidget {
           };
           RouterCenterImpl()
               .findMainRouter()
-              .jumpPage(context, cards.hospital.messageUrl, map, true);
+              .jumpPage(context, cards.hospital.gm_url, map, true);
         },
         child: Container(
           margin: EdgeInsets.only(left: 15, right: 15),
@@ -233,7 +232,7 @@ class LevelOneItem extends StatelessWidget {
               ),
               Positioned(
                 left: 57,
-                top: 17.5,
+                top: 15,
                 child: Container(
                   width: MediaQuery.of(context).size.width - 30 - 57,
                   child: baseText(cards.hospital.name, 15, Color(0xff333333),

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -278,7 +278,7 @@ class LevelOneState extends BaseState<LevelOnePage>
     return Container(
       width: MediaQuery.of(context).size.width,
       height: 54,
-      margin: EdgeInsets.only(top: 18, bottom: 12),
+      margin: EdgeInsets.only(top: 14, bottom: 12),
       child: Stack(
         children: <Widget>[
           Positioned(
@@ -288,7 +288,7 @@ class LevelOneState extends BaseState<LevelOnePage>
                 bold: true),
           ),
           Positioned(
-            bottom: 8,
+            bottom: 6,
             left: 15,
             child: Container(
               width: MediaQuery.of(context).size.width - 30 - 100,
@@ -358,18 +358,8 @@ class LevelOneState extends BaseState<LevelOnePage>
             children: <Widget>[
               Container(
                 margin: EdgeInsets.only(left: 2, right: 2),
-                child: Text(
-                  element.attrValue,
-                  textScaleFactor: 1.0,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                      decoration: TextDecoration.none,
-                      fontSize: 14,
-                      color: Color(0xff282828),
-                      fontStyle: FontStyle.normal,
-                      fontWeight: FontWeight.w400),
-                ),
+                child: baseText(element.attrValue, 14, Color(0xff282828),
+                    bold: true),
               ),
               Container(
                 margin: EdgeInsets.only(left: 2, right: 2),

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -341,8 +341,12 @@ class LevelTwoState extends BaseState<LevelTwoPage>
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
-              baseText(element.attrValue, 14, Color(0xff282828), bold: true),
-              baseText(element.attrName, 11, Color(0xff999999)),
+              Container(
+                margin: EdgeInsets.only(left: 2, right: 2),
+                child: baseText(element.attrName, 14, Color(0xff282828),
+                    bold: true),
+              ),
+              baseText(element.attrValue, 11, Color(0xff999999)),
             ],
           ),
         ),

lib/ClueModel/page/plan/FilterView.dart

@@ -56,6 +56,22 @@ class FilterViewState extends State<FilterView> {
       height: 186,
       child: Stack(
         children: <Widget>[
+          Positioned(
+            top: 0,
+            child: Container(
+              width: MediaQuery.of(context).size.width,
+              height: 1,
+              decoration: BoxDecoration(
+                boxShadow: [
+                  BoxShadow(
+                      color: Color(0x08000000),
+                      offset: Offset(0.0,1.0),
+                      blurRadius: 6.0,
+                      spreadRadius: 0.0),
+                ],
+              ),
+            ),
+          ),
           Positioned(
             top: 54.5,
             right: 15,

lib/ClueModel/page/plan/PlanBar.dart

@@ -66,17 +66,21 @@ class PlanBarView extends StatelessWidget {
         },
         child: Container(
           alignment: Alignment.center,
+          height: double.maxFinite,
           child: Row(
             mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.end,
             children: <Widget>[
-              baseText(text, 14,
+              Container(
+                height: double.maxFinite,
+                alignment: Alignment.center,
+                child: baseText(text, 14,
                     index == showIndex ? Color(0xff3FB5AF) : Color(0xff666666)),
+              )
+              ,
               Container(
                 width: 10,
-                height: 13,
-                padding: EdgeInsets.only(top: 3),
-                alignment: Alignment.topCenter,
+                alignment: Alignment.center,
+                height: double.maxFinite,
                 child: Container(
                   width: 6,
                   height: 3.5,

lib/ClueModel/page/plan/PlanItem.dart

@@ -56,7 +56,7 @@ class PlanItem extends StatelessWidget {
       showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea;
     }
     return Container(
-        margin: EdgeInsets.only(top: 10, left: 10, right: 10),
+        margin: EdgeInsets.only(top:  4, left: 10, right: 10),
         child: Card(
           elevation: 3.0,
           child: Container(
@@ -82,13 +82,13 @@ class PlanItem extends StatelessWidget {
                 ),
                 Positioned(
                   left: 92,
-                  top: 14,
+                  top: 10,
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[
                       Container(
-                        constraints: BoxConstraints(maxWidth: 126),
+                        constraints: BoxConstraints(maxWidth: 116),
                         child: baseText(plans.name, 14, Color(0xff282828),
                             bold: true),
                       ),
@@ -107,16 +107,15 @@ class PlanItem extends StatelessWidget {
                                     borderRadius: BorderRadius.circular(2),
                                     color: Color(0xffF0F9F7)),
                                 alignment: Alignment.center,
-                                child: baseText(showOprea, 11,
-                                    Color(0xff3FB5AF),
-                                    bold: true),
+                                child:
+                                    baseText(showOprea, 11, Color(0xff3FB5AF)),
                               ),
                             )
                     ],
                   ),
                 ),
                 Positioned(
-                  top: 15,
+                  top: 12,
                   right: 10,
                   child: Row(
                     textBaseline: TextBaseline.alphabetic,
@@ -132,15 +131,11 @@ class PlanItem extends StatelessWidget {
                     ],
                   ),
                 ),
-                Positioned(
-                  bottom: 16,
-                  right: 10,
-                  child:
-                      baseText("销量${plans.salesCount}", 11, Color(0xff282828)),
-                ),
                 Positioned(
                   left: 91,
-                  bottom: 14,
+                  bottom: 8,
+                  child: Container(
+                    width: MediaQuery.of(context).size.width - 30 - 91 - 10,
                     child: Row(
                       textBaseline: TextBaseline.alphabetic,
                       crossAxisAlignment: CrossAxisAlignment.baseline,
@@ -158,10 +153,15 @@ class PlanItem extends StatelessWidget {
                             price == "暂无报价"
                                 ? Color(0xff999999)
                                 : Color(0xffFF5963),
-                          bold: price != "暂无报价")
+                            bold: price != "暂无报价"),
+                        Expanded(
+                          child: Container(),
+                        ),
+                        baseText("销量${plans.salesCount}", 11, Color(0xff282828))
                       ],
                     ),
                   ),
+                ),
                 Positioned(
                   left: 92,
                   top: 36,

lib/ClueModel/page/plan/PlanPage.dart

@@ -497,10 +497,10 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
       decoration: BoxDecoration(
         boxShadow: [
           BoxShadow(
-              color: Colors.black12,
+              color: Color(0x08000000),
               offset: Offset(0.0, 2.0),
-              blurRadius: 0.5,
-              spreadRadius: 0.5)
+              blurRadius: 12,
+              spreadRadius: 0)
         ],
         color: Colors.white,
       ),

lib/ClueModel/page/plan/ProjectView.dart

@@ -102,7 +102,7 @@ class ProjectViewState extends State<ProjectView> {
             child: ListView.builder(
               itemBuilder: (c, index) {
                 return Container(
-                  margin: EdgeInsets.only(left: 20, top: 18, bottom: 18),
+                  margin: EdgeInsets.only(left: 20, top: 15, bottom: 18),
                   child: baseText(widget.datas[selectIndex].subtags[index].name,
                       14, Color(0xff464646)),
                 ).gestureDetector(() {

lib/ClueModel/page/plan/SortView.dart

@@ -31,7 +31,7 @@ class SortView extends StatelessWidget {
               child: Stack(
                 children: <Widget>[
                   Positioned(
-                    top: 16,
+                    top: 13,
                     child: baseText(
                         datas[index].name,
                         13,

lib/ClueModel/page/top/TopPage.dart

@@ -83,7 +83,9 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
   @override
   Widget buildItem(BuildContext context) {
     return Scaffold(
-      body: baseStateView(
+        body: SafeArea(
+          top: false,
+      child: baseStateView(
           MediaQuery.of(context).size.width,
           MediaQuery.of(context).size.height,
           _model.stateLive,
@@ -104,7 +106,7 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
       },
           paddingTop:
               MediaQueryData.fromWindow(window).padding.top + kToolbarHeight),
-    );
+    ));
   }
 
   Widget homeWarp() {
@@ -138,9 +140,12 @@ class TopPageState extends BaseState<TopPage> with TickerProviderStateMixin {
               }
               return false;
             },
+            child: Container(
+              color: Color(0xffF7F6FA),
               child: home(),
             ),
           ),
+        ),
         baseSliverBack(() {
           if (RouterCenterImpl().findMainRouter().isWithNative()) {
             FlutterBoost.singleton.closeCurrent();

lib/ClueModel/server/entity/LevelOneFeedList.dart

@@ -211,6 +211,7 @@ class Hospital {
   String consultType;
   String messageUrl;
   bool isCheck = false;
+  String gm_url;
 
   Hospital(
       {this.portrait,
@@ -229,6 +230,7 @@ class Hospital {
     name = json['name'];
     minPrice = json['min_price'];
     maxPrice = json['max_price'];
+    gm_url = json['gm_url'];
     star = json['star'];
     address = json['address'];
     consultType = json['consult_type'];
@@ -244,6 +246,7 @@ class Hospital {
     data['min_price'] = this.minPrice;
     data['max_price'] = this.maxPrice;
     data['star'] = this.star;
+    data['gm_url'] = this.gm_url;
     data['address'] = this.address;
     data['consult_type'] = this.consultType;
     data['message_url'] = this.messageUrl;
@@ -261,6 +264,7 @@ class Doctor {
   String title;
   String consultType;
   String messageUrl;
+  String gm_url;
 
   Doctor(
       {this.portrait,
@@ -278,6 +282,7 @@ class Doctor {
     minPrice = json['min_price'];
     maxPrice = json['max_price'];
     doctor_id = json['doctor_id'];
+    gm_url = json['gm_url'];
     star = json['star'];
     title = json['title'];
     consultType = json['consult_type'];
@@ -290,6 +295,7 @@ class Doctor {
     data['name'] = this.name;
     data['doctor_id'] = this.doctor_id;
     data['min_price'] = this.minPrice;
+    data['gm_url'] = this.gm_url;
     data['max_price'] = this.maxPrice;
     data['star'] = this.star;
     data['title'] = this.title;

lib/commonModel/base/BaseComponent.dart

@@ -319,7 +319,7 @@ Widget baseRefreshView(RefreshController refreshController,
 //            body = baseText("加载失败", 12, Color(0xff545454));
 //          } else
           if (mode == LoadStatus.noMore) {
-            body = baseText("没有更多数据了", 12, Color(0xff545454));
+            body = baseText("我们是有底线的", 12, Color(0xff545454));
           }
 //          else {
 //            body = Container();
@@ -433,10 +433,10 @@ Widget baseTabBar(
         color: Colors.white,
         boxShadow: [
           BoxShadow(
-              color: Colors.black12,
+              color: Color(0x08000000),
               offset: Offset(0.0, 2.0),
-              blurRadius: 0.5,
-              spreadRadius: 0.5)
+              blurRadius: 12,
+              spreadRadius: 0)
         ],
       ),
       child: TabBar(
@@ -447,9 +447,9 @@ Widget baseTabBar(
         unselectedLabelColor: color ?? Color(0xffB5B5B5),
         labelColor: color ?? Color(0xff282828),
         labelStyle:
-            TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w500),
+            TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w600),
         unselectedLabelStyle:
-            TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w500),
+            TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w600),
         labelPadding: EdgeInsets.only(),
         indicator: baseIndicator ?? BaseIndicator(),
         tabs: list,