Skip to content

G
gm_flutter
Commit 02ff9b47 authored by 林生雨's avatar 林生雨
Browse files
Options

W

parent 01b6ab28
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 80 deletions
lib/ClueModel/page/levelOne/LevelOneItem.dart
View file @ 02ff9b47
...@@ -587,22 +587,26 @@ class LevelOneItem extends StatelessWidget { ...@@ -587,22 +587,26 @@ class LevelOneItem extends StatelessWidget {
) )
], ],
)), )),
Container( cards.diary.content != null && cards.diary.content.isNotEmpty
margin: EdgeInsets.only(top: 7.5, bottom: 4), ? Container(
child: Text( margin: EdgeInsets.only(top: 7.5, bottom: 4),
cards.diary.content, child: Text(
textScaleFactor: 1.0, cards.diary.content,
maxLines: 5, textScaleFactor: 1.0,
strutStyle: StrutStyle(forceStrutHeight: true, height: 2), maxLines: 5,
overflow: TextOverflow.ellipsis, strutStyle: StrutStyle(forceStrutHeight: true, height: 2),
style: TextStyle( overflow: TextOverflow.ellipsis,
decoration: TextDecoration.none, style: TextStyle(
fontSize: 15, decoration: TextDecoration.none,
color: Color(0xff464646), fontSize: 15,
fontStyle: FontStyle.normal, color: Color(0xff464646),
fontWeight: FontWeight.w400), fontStyle: FontStyle.normal,
), fontWeight: FontWeight.w400),
), ),
)
: Container(
height: 0,
),
baseText("项目${cards.diary.title}", 13, Color(0xff999999)), baseText("项目${cards.diary.title}", 13, Color(0xff999999)),
Container( Container(
margin: EdgeInsets.only(top: 9, bottom: 16), margin: EdgeInsets.only(top: 9, bottom: 16),
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 02ff9b47
...@@ -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';
......
lib/ClueModel/page/plan/PlanModel.dart
View file @ 02ff9b47
...@@ -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();
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ 02ff9b47
...@@ -440,77 +440,72 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -440,77 +440,72 @@ 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, initialData: _model.picLive.data ?? null,
initialData: _model.picLive.data ?? null, builder: (c, data) {
builder: (c, data) { return ClipRRect(
return ClipRRect( borderRadius: BorderRadius.circular(3),
borderRadius: BorderRadius.circular(3), child: CachedNetworkImage(
child: CachedNetworkImage( imageUrl:
imageUrl: data.data == null ? "" : data.data[0].icon ?? "",
data.data == null ? "" : data.data[0].icon ?? "", fit: BoxFit.cover,
fit: BoxFit.cover, )).gestureDetector(() {
)).gestureDetector(() { Map<String, dynamic> map = {
Map<String, dynamic> map = { "rank_type": "0",
"rank_type": "0", "id": "${data.data[0].id}",
"id": "${data.data[0].id}", "title": "${data.data[0].name}",
"title": "${data.data[0].name}", "business_id": "${data.data[0].id}",
"business_id": "${data.data[0].id}", "referrer_tab_name": ""
"referrer_tab_name": "" };
};
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, "favor_plan", map, false); .jumpPage(context, "favor_plan", map, false);
}); });
}, },
),
), ),
), ),
// ), Container(
Expanded( width: 10,
child: Container(),
), ),
// Container( Expanded(
// width: 10, child: AspectRatio(
// ), aspectRatio: 335 / 180,
// Expanded( child: StreamBuilder<List<Ranks>>(
// child: stream: _model.picLive.stream,
AspectRatio( initialData: _model.picLive.data ?? null,
aspectRatio: 335 / 180, builder: (c, data) {
child: StreamBuilder<List<Ranks>>( return ClipRRect(
stream: _model.picLive.stream, borderRadius: BorderRadius.circular(3),
initialData: _model.picLive.data ?? null, child: CachedNetworkImage(
builder: (c, data) { imageUrl:
return ClipRRect( data.data == null ? "" : data.data[1].icon ?? "",
borderRadius: BorderRadius.circular(3), fit: BoxFit.cover,
child: CachedNetworkImage( )).gestureDetector(() {
imageUrl: Map<String, dynamic> map = {
data.data == null ? "" : data.data[1].icon ?? "", "rank_type": "1",
fit: BoxFit.cover, "id": "${data.data[1].id}",
)).gestureDetector(() { "title": "${data.data[1].name}",
Map<String, dynamic> map = { "business_id": "${data.data[1].id}",
"rank_type": "1", "referrer_tab_name": ""
"id": "${data.data[1].id}", };
"title": "${data.data[1].name}",
"business_id": "${data.data[1].id}",
"referrer_tab_name": ""
};
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, "hot_plan", map, false); .jumpPage(context, "hot_plan", map, false);
}); });
}, },
),
), ),
// ),
) )
], ],
), ),
......
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