conflict fix

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -104,7 +104,7 @@ class LevelOneItem extends StatelessWidget {
               top: 18,
               child: Row(
                 mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.end,
+                crossAxisAlignment: CrossAxisAlignment.center,
                 children: <Widget>[
                   baseText(cards.doctor.name, 15, Color(0xff333333),
                       bold: true),

lib/ClueModel/page/plan/PlanItem.dart

@@ -78,38 +78,47 @@ class PlanItem extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.center,
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[
-                      baseText(plans.name, 14, Color(0xff282828), bold: true),
                       Container(
-                        margin: EdgeInsets.only(left: 4),
-                        child: Container(
-                          width: 28,
-                          height: 15,
-                          decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(2),
-                              color: Color(0xffF0F9F7)),
-                          alignment: Alignment.center,
-                          child: baseText(
-                              "${plans.operation_type}", 11, Color(0xff3FB5AF),
-                              bold: true),
-                        ),
-                      )
+                        constraints: BoxConstraints(maxWidth: 110),
+                        child: baseText(plans.name, 14, Color(0xff282828),
+                            bold: true),
+                      ),
+                      plans.operation_type.empty()
+                          ? Container(
+                              width: 0,
+                              height: 0,
+                            )
+                          : Container(
+                              constraints: BoxConstraints(maxWidth: 60),
+                              margin: EdgeInsets.only(left: 4),
+                              child: Container(
+                                padding: EdgeInsets.only(
+                                    top: 2, bottom: 2, left: 3, right: 3),
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(2),
+                                    color: Color(0xffF0F9F7)),
+                                alignment: Alignment.center,
+                                child: baseText("${plans.operation_type}", 11,
+                                    Color(0xff3FB5AF),
+                                    bold: true),
+                              ),
+                            )
                     ],
                   ),
                 ),
                 Positioned(
-                  top: 14,
+                  top: 15,
                   right: 10,
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
 //                crossAxisAlignment: CrossAxisAlignment.end,
                     verticalDirection: VerticalDirection.down,
-
                     children: <Widget>[
                       baseText("好评率", 11, Color(0xff282828)),
                       Container(
                         width: 4,
                       ),
-                      baseText("${rate}", 14, Color(0xffFF5963)),
+                      baseText("${rate}", 14, Color(0xffFF5963), bold: true),
                       baseText("%", 10, Color(0xffFF5963)),
                     ],
                   ),
@@ -117,8 +126,8 @@ class PlanItem extends StatelessWidget {
                 Positioned(
                   bottom: 14,
                   right: 10,
-                  child: baseText("销量${plans.salesCount}",
-                      11, Color(0xff282828)),
+                  child:
+                      baseText("销量${plans.salesCount}", 11, Color(0xff282828)),
                 ),
                 Positioned(
                   left: 91,