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

fix UI

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