Commit 02ff9b47 authored by 林生雨's avatar 林生雨

W

parent 01b6ab28
...@@ -587,7 +587,8 @@ class LevelOneItem extends StatelessWidget { ...@@ -587,7 +587,8 @@ class LevelOneItem extends StatelessWidget {
) )
], ],
)), )),
Container( cards.diary.content != null && cards.diary.content.isNotEmpty
? Container(
margin: EdgeInsets.only(top: 7.5, bottom: 4), margin: EdgeInsets.only(top: 7.5, bottom: 4),
child: Text( child: Text(
cards.diary.content, cards.diary.content,
...@@ -602,6 +603,9 @@ class LevelOneItem extends StatelessWidget { ...@@ -602,6 +603,9 @@ class LevelOneItem extends StatelessWidget {
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400), fontWeight: FontWeight.w400),
), ),
)
: Container(
height: 0,
), ),
baseText("项目${cards.diary.title}", 13, Color(0xff999999)), baseText("项目${cards.diary.title}", 13, Color(0xff999999)),
Container( Container(
......
...@@ -12,7 +12,6 @@ import 'package:flutter/cupertino.dart'; ...@@ -12,7 +12,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:flutter_common/commonModel/picker/base/BaseBottomPicker.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/DiscussLowPrice/DiscussLowPricePopView.dart';
import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart'; import 'package:gm_flutter/ClueModel/page/common/StickyTabBarDelegate.dart';
import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart'; import 'package:gm_flutter/ClueModel/page/levelOne/LevelOneList.dart';
......
...@@ -198,7 +198,6 @@ class PlanModel extends BaseModel { ...@@ -198,7 +198,6 @@ class PlanModel extends BaseModel {
feedDatas.add(element); feedDatas.add(element);
} }
}); });
feedDatas.addAll(event.data.plans);
feedsLive.notifyView(Pair(ENDLOADING, feedDatas)); feedsLive.notifyView(Pair(ENDLOADING, feedDatas));
} }
controller?.refreshCompleted(); controller?.refreshCompleted();
......
...@@ -440,13 +440,12 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -440,13 +440,12 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
Widget towPic() { Widget towPic() {
return Container( return Container(
height: 90, // height: 90,
margin: EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0), margin: EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
// Expanded( Expanded(
// child: child: AspectRatio(
AspectRatio(
aspectRatio: 335 / 180, aspectRatio: 335 / 180,
child: StreamBuilder<List<Ranks>>( child: StreamBuilder<List<Ranks>>(
stream: _model.picLive.stream, stream: _model.picLive.stream,
...@@ -474,16 +473,12 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -474,16 +473,12 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
}, },
), ),
), ),
// ),
Expanded(
child: Container(),
), ),
// Container( Container(
// width: 10, width: 10,
// ), ),
// Expanded( Expanded(
// child: child: AspectRatio(
AspectRatio(
aspectRatio: 335 / 180, aspectRatio: 335 / 180,
child: StreamBuilder<List<Ranks>>( child: StreamBuilder<List<Ranks>>(
stream: _model.picLive.stream, stream: _model.picLive.stream,
...@@ -510,7 +505,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -510,7 +505,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
}); });
}, },
), ),
// ), ),
) )
], ],
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment