Commit 4494ae77 authored by 林生雨's avatar 林生雨

w

parent 24856199
......@@ -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>[
......
......@@ -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,
......
......@@ -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() {
......
......@@ -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);
......@@ -446,70 +446,70 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
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": ""
};
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(),
),
Expanded(
child: Container(),
),
// Container(
// width: 10,
// ),
// Expanded(
// child:
AspectRatio(
aspectRatio: 335/180,
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": ""
};
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);
});
},
),
// ),
)
],
......
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