W

lib/ClueModel/page/levelOne/LevelOneItem.dart

@@ -587,22 +587,26 @@ class LevelOneItem extends StatelessWidget {
                       )
                     ],
                   )),
-          Container(
-            margin: EdgeInsets.only(top: 7.5, bottom: 4),
-            child: Text(
-              cards.diary.content,
-              textScaleFactor: 1.0,
-              maxLines: 5,
-              strutStyle: StrutStyle(forceStrutHeight: true, height: 2),
-              overflow: TextOverflow.ellipsis,
-              style: TextStyle(
-                  decoration: TextDecoration.none,
-                  fontSize: 15,
-                  color: Color(0xff464646),
-                  fontStyle: FontStyle.normal,
-                  fontWeight: FontWeight.w400),
-            ),
-          ),
+          cards.diary.content != null && cards.diary.content.isNotEmpty
+              ? Container(
+                  margin: EdgeInsets.only(top: 7.5, bottom: 4),
+                  child: Text(
+                    cards.diary.content,
+                    textScaleFactor: 1.0,
+                    maxLines: 5,
+                    strutStyle: StrutStyle(forceStrutHeight: true, height: 2),
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                        decoration: TextDecoration.none,
+                        fontSize: 15,
+                        color: Color(0xff464646),
+                        fontStyle: FontStyle.normal,
+                        fontWeight: FontWeight.w400),
+                  ),
+                )
+              : Container(
+                  height: 0,
+                ),
           baseText("项目${cards.diary.title}", 13, Color(0xff999999)),
           Container(
             margin: EdgeInsets.only(top: 9, bottom: 16),

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -12,7 +12,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_boost/flutter_boost.dart';
 import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.dart';
-import 'package:flutter_screenutil/screenutil.dart';
 import 'package:gm_flutter/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart';
 import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
 import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart';

lib/ClueModel/page/plan/PlanModel.dart

@@ -198,7 +198,6 @@ class PlanModel extends BaseModel {
                   feedDatas.add(element);
                 }
               });
-              feedDatas.addAll(event.data.plans);
               feedsLive.notifyView(Pair(ENDLOADING, feedDatas));
             }
             controller?.refreshCompleted();

lib/ClueModel/page/plan/PlanPage.dart

@@ -440,77 +440,72 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
 
   Widget towPic() {
     return Container(
-      height: 90,
+//      height: 90,
       margin: EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
       child: Row(
         children: <Widget>[
-//          Expanded(
-//            child:
-          AspectRatio(
-            aspectRatio: 335 / 180,
-            child: StreamBuilder<List<Ranks>>(
-              stream: _model.picLive.stream,
-              initialData: _model.picLive.data ?? null,
-              builder: (c, data) {
-                return ClipRRect(
-                    borderRadius: BorderRadius.circular(3),
-                    child: CachedNetworkImage(
-                      imageUrl:
-                          data.data == null ? "" : data.data[0].icon ?? "",
-                      fit: BoxFit.cover,
-                    )).gestureDetector(() {
-                  Map<String, dynamic> map = {
-                    "rank_type": "0",
-                    "id": "${data.data[0].id}",
-                    "title": "${data.data[0].name}",
-                    "business_id": "${data.data[0].id}",
-                    "referrer_tab_name": ""
-                  };
+          Expanded(
+            child: AspectRatio(
+              aspectRatio: 335 / 180,
+              child: StreamBuilder<List<Ranks>>(
+                stream: _model.picLive.stream,
+                initialData: _model.picLive.data ?? null,
+                builder: (c, data) {
+                  return ClipRRect(
+                      borderRadius: BorderRadius.circular(3),
+                      child: CachedNetworkImage(
+                        imageUrl:
+                            data.data == null ? "" : data.data[0].icon ?? "",
+                        fit: BoxFit.cover,
+                      )).gestureDetector(() {
+                    Map<String, dynamic> map = {
+                      "rank_type": "0",
+                      "id": "${data.data[0].id}",
+                      "title": "${data.data[0].name}",
+                      "business_id": "${data.data[0].id}",
+                      "referrer_tab_name": ""
+                    };
 
-                  RouterCenterImpl()
-                      .findMainRouter()
-                      .jumpPage(context, "favor_plan", map, false);
-                });
-              },
+                    RouterCenterImpl()
+                        .findMainRouter()
+                        .jumpPage(context, "favor_plan", map, false);
+                  });
+                },
+              ),
             ),
           ),
-//          ),
-          Expanded(
-            child: Container(),
+          Container(
+            width: 10,
           ),
-//          Container(
-//            width: 10,
-//          ),
-//          Expanded(
-//            child:
-          AspectRatio(
-            aspectRatio: 335 / 180,
-            child: StreamBuilder<List<Ranks>>(
-              stream: _model.picLive.stream,
-              initialData: _model.picLive.data ?? null,
-              builder: (c, data) {
-                return ClipRRect(
-                    borderRadius: BorderRadius.circular(3),
-                    child: CachedNetworkImage(
-                      imageUrl:
-                          data.data == null ? "" : data.data[1].icon ?? "",
-                      fit: BoxFit.cover,
-                    )).gestureDetector(() {
-                  Map<String, dynamic> map = {
-                    "rank_type": "1",
-                    "id": "${data.data[1].id}",
-                    "title": "${data.data[1].name}",
-                    "business_id": "${data.data[1].id}",
-                    "referrer_tab_name": ""
-                  };
+          Expanded(
+            child: AspectRatio(
+              aspectRatio: 335 / 180,
+              child: StreamBuilder<List<Ranks>>(
+                stream: _model.picLive.stream,
+                initialData: _model.picLive.data ?? null,
+                builder: (c, data) {
+                  return ClipRRect(
+                      borderRadius: BorderRadius.circular(3),
+                      child: CachedNetworkImage(
+                        imageUrl:
+                            data.data == null ? "" : data.data[1].icon ?? "",
+                        fit: BoxFit.cover,
+                      )).gestureDetector(() {
+                    Map<String, dynamic> map = {
+                      "rank_type": "1",
+                      "id": "${data.data[1].id}",
+                      "title": "${data.data[1].name}",
+                      "business_id": "${data.data[1].id}",
+                      "referrer_tab_name": ""
+                    };
 
-                  RouterCenterImpl()
-                      .findMainRouter()
-                      .jumpPage(context, "hot_plan", map, false);
-                });
-              },
+                    RouterCenterImpl()
+                        .findMainRouter()
+                        .jumpPage(context, "hot_plan", map, false);
+                  });
+                },
+              ),
             ),
-//            ),
           )
         ],
       ),