Commit 80421370 authored by 林生雨's avatar 林生雨

fix UI

parent c2e4e94b
......@@ -53,7 +53,7 @@ class _PopView implements ICenterPicker {
width: contentWidth,
height: _model.popViewLive.data.second.title.length > 13
? 377.5
: 325.5,
: 330.5,
child: Stack(
alignment: AlignmentDirectional.topCenter,
children: <Widget>[
......@@ -146,7 +146,7 @@ class _PopView implements ICenterPicker {
Container(
width: contentWidth,
alignment: Alignment.center,
margin: EdgeInsets.only(bottom: 25),
margin: EdgeInsets.only(bottom: 25,left: 30,right: 30),
child: baseText("${_model.popViewLive.data.second.title}", 18,
Color(0xff464646),
bold: true, textAlign: TextAlign.center, maxLines: 2)),
......
......@@ -52,20 +52,18 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget buildItem(BuildContext context) {
screenWidth = MediaQuery.of(context).size.width;
return Scaffold(
appBar: baseAppBar(
titleWidget: baseText("对比详情", 18, Color(0xff333333), bold: true),
centerTitle: true,
backClick: () {
if (RouterCenterImpl().findMainRouter().isWithNative()) {
FlutterBoost.singleton.closeCurrent();
} else {
Navigator.of(context).pop();
}
}),
body: Container(
color: Color(0xffF7F6FA),
child: reloadPage(),
));
appBar: baseAppBar(
titleWidget: baseText("对比详情", 18, Color(0xff333333), bold: true),
centerTitle: true,
backClick: () {
if (RouterCenterImpl().findMainRouter().isWithNative()) {
FlutterBoost.singleton.closeCurrent();
} else {
Navigator.of(context).pop();
}
}),
body: reloadPage(),
);
}
Widget reloadPage() {
......@@ -83,17 +81,26 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
if (data.data == LOADING) {
return loadingItem();
}
return setupHome();
return Stack(
children: <Widget>[
setupHome(),
head(),
],
);
},
);
}
Widget setupHome() {
return Column(
return Container(
child: Column(
children: <Widget>[
head(),
Container(
height: 93,
),
Expanded(
child: Container(
color: Color(0xffF7F6FA),
child: StreamBuilder<Pair<int, List<Groups>>>(
stream: _model.detailLive.stream,
initialData: _model.detailLive.data ?? Pair(LOADING, null),
......@@ -129,8 +136,11 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
widget = planNormalEffectiveAttrsView(group);
}
return Container(
margin: EdgeInsets.only(left: 0, right: 0),
child: widget,
color: Colors.white,
child: Container(
margin: EdgeInsets.only(left: 15, right: 15),
child: widget,
),
);
},
itemCount: data.data.second.length * 2,
......@@ -138,7 +148,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
}),
))
],
);
));
}
Widget head() {
......@@ -255,15 +265,13 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
Widget planPopularityView(Groups groups) {
return Container(
color: Colors.white,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
titleView(groups.groupName),
planPopularityBodyView(groups),
Container()
]));
titleView(groups.groupName),
planPopularityBodyView(groups),
]));
}
Widget planPopularityBodyView(Groups groups) {
......@@ -431,7 +439,6 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
height: 6,
));
return Container(
color: Colors.white,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
......
......@@ -2,6 +2,8 @@
* @author lsy
* @date 2020/7/2
**/
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:gm_flutter/ClueModel/page/plan/PlanItem.dart';
import 'package:gm_flutter/ClueModel/server/entity/PlanFeedBean.dart';
......@@ -68,7 +70,7 @@ class TopListState extends State<TopList> with AutomaticKeepAliveClientMixin {
slivers: <Widget>[
SliverToBoxAdapter(
child: Container(
height: widget.topHeight,
height: widget.topHeight-(Platform.isIOS ? 12 : 6),
),
),
// extend.SliverOverlapInjector(
......
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