Merge branch 'test' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter

lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart

@@ -52,8 +52,8 @@ class _PopView implements ICenterPicker {
               child: Container(
                 width: contentWidth,
                 height: _model.popViewLive.data.second.title.length > 13
-                    ? 367.5
-                    : 310.5,
+                    ? 377.5
+                    : 325.5,
                 child: Stack(
                     alignment: AlignmentDirectional.topCenter,
                     children: <Widget>[

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -588,7 +588,7 @@ class LevelOneItem extends StatelessWidget {
                     ],
                   )),
           Container(
-            margin: EdgeInsets.only(top: 12.5, bottom: 12),
+            margin: EdgeInsets.only(top: 7.5, bottom: 4),
             child: Text(
               cards.diary.content,
               textScaleFactor: 1.0,
@@ -605,7 +605,7 @@ class LevelOneItem extends StatelessWidget {
           ),
           baseText("项目${cards.diary.title}", 13, Color(0xff999999)),
           Container(
-            margin: EdgeInsets.only(top: 12, bottom: 16),
+            margin: EdgeInsets.only(top: 9, bottom: 16),
             height: 14,
             child: Row(
               mainAxisSize: MainAxisSize.min,

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -246,7 +246,9 @@ class LevelTwoState extends BaseState<LevelTwoPage>
             ),
           ];
         },
-        body: TabBarView(controller: tabController, children: list));
+        body: Container(
+            color: Color(0xffF7F6FA),
+            child: TabBarView(controller: tabController, children: list)));
   }
 
   List<Widget> getTabs() {

lib/ClueModel/page/plan/PlanPage.dart

@@ -65,7 +65,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
   @override
   void initState() {
     if (RouterCenterImpl().findMainRouter().isWithNative() &&
-        CacheManager.getInstance().get(MEMORY_CACHE).get(BASE_URL).empty()) {
+        CacheManager.getInstance().get(MEMORY_CACHE).get(BASE_URL) == null) {
       func = (str) {
         if (str == "init") {
           _model.init(needCache: true);
@@ -447,7 +447,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
 //          Expanded(
 //            child:
           AspectRatio(
-              aspectRatio: 335/180,
+            aspectRatio: 335 / 180,
             child: StreamBuilder<List<Ranks>>(
               stream: _model.picLive.stream,
               initialData: _model.picLive.data ?? null,
@@ -484,7 +484,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
 //          Expanded(
 //            child:
           AspectRatio(
-            aspectRatio: 335/180,
+            aspectRatio: 335 / 180,
             child: StreamBuilder<List<Ranks>>(
               stream: _model.picLive.stream,
               initialData: _model.picLive.data ?? null,