Skip to content

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

w

parent 5d95c2ac
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 28 deletions
lib/ClueModel/page/DiscussLowPrice/DiscussLowPricePopView.dart
View file @ aaa5519f
......@@ -56,7 +56,6 @@ class _PopView implements ICenterPicker {
return Opacity(
opacity: alp / 255.0,
child: Container(
color: Colors.red,
width: contentWidth,
height: _model.popViewLive.data.second.title.length > 13
? 367.5
......
lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart
View file @ aaa5519f
......@@ -446,10 +446,10 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
children: <Widget>[
planItem(
index > plan1.attrs.length - 1
? "无"
? "暂无"
: "${plan1.attrs[index].attrValue}",
index > plan2.attrs.length - 1
? "无"
? "暂无"
: "${plan2.attrs[index].attrValue}",
false),
Container(
......@@ -457,10 +457,10 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
),
planItem(
index > plan1.attrs.length - 1
? "无"
? "暂无"
: "${plan1.attrs[index].attrName}",
index > plan2.attrs.length - 1
? "无"
? "暂无"
: "${plan2.attrs[index].attrName}",
true),
Container(
......@@ -475,7 +475,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
return Row(children: <Widget>[
Expanded(
flex: 1,
child: baseText(left.empty() ? "无" : left, 14,
child: baseText(left.empty() ? "暂无" : left, 14,
isName ? Color(0xff666666) : Color(0xff3FB5AF),
bold: true, maxLines: 100, isWarp: true, textAlign: TextAlign.end),
),
......@@ -484,7 +484,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
),
Expanded(
flex: 1,
child: baseText(right.empty() ? "无" : right, 14,
child: baseText(right.empty() ? "暂无" : right, 14,
isName ? Color(0xff666666) : Color(0xffF25874),
bold: true,
maxLines: 100,
......
lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart
View file @ aaa5519f
......@@ -54,7 +54,7 @@ class ProjectDetailsItemView extends StatelessWidget {
Container(
margin: EdgeInsets.only(right: 25.0, left: 15, bottom: 25),
width: 78,
child: baseText(attrs.attrName.empty() ? "无" : attrs.attrName, 13,
child: baseText(attrs.attrName.empty() ? "暂无" : attrs.attrName, 13,
Color(0xFF999999),
textAlign: TextAlign.start,
maxLines: 2,
......@@ -62,7 +62,7 @@ class ProjectDetailsItemView extends StatelessWidget {
Expanded(
child: Container(
margin: EdgeInsets.only(right: 15, bottom: 25),
child: baseText(attrs.attrValue.empty() ? "无" : attrs.attrValue,
child: baseText(attrs.attrValue.empty() ? "暂无" : attrs.attrValue,
14, Color(0xFF282828),
textAlign: TextAlign.start,
maxLines: 2,
......
lib/ClueModel/page/ProjectDetails/ProjectDetailsPage.dart
View file @ aaa5519f
......@@ -70,7 +70,10 @@ class _ProjectDetailsState extends BaseState<ProjectDetailsPage> {
return Container();
}
ProjectDetailsItem item = data.data;
if (item == null || item.data == null || item.data.groups == null) {
if (item == null ||
item.data == null ||
item.data.groups == null ||
item.data.groups.isEmpty) {
return emptyItem(MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height);
}
......
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ aaa5519f
......@@ -448,11 +448,9 @@ class LevelOneState extends BaseState<LevelOnePage>
child: Row(
children: <Widget>[
Container(
width: 52,
// constraints: BoxConstraints(
// maxWidth: 52,
// minWidth:
// ),
constraints: BoxConstraints(
maxWidth: 55,
),
child: Text(
element.attrName.length == 2
? "${element.attrName.substring(0, 1)} ${element.attrName.substring(1, 2)}"
......@@ -460,9 +458,11 @@ class LevelOneState extends BaseState<LevelOnePage>
textScaleFactor: 1.0,
softWrap: true,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.start,
style: TextStyle(
decoration: TextDecoration.none,
fontSize: 13,
color: Color(0xff999999),
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ aaa5519f
......@@ -48,6 +48,13 @@ class PlanItem extends StatelessWidget {
}
rate = rate.replaceAll("%", "");
var price = NumPlanUtil.getPrice(plans.minPrice, plans.maxPrice);
String showOprea = "";
if (!plans.operation_type.empty()) {
showOprea = plans.operation_type.contains(";")
? plans.operation_type.split(";")[0]
: plans.operation_type;
showOprea = showOprea.length > 4 ? showOprea.substring(0, 4) : showOprea;
}
return Container(
margin: EdgeInsets.only(top: 10, left: 10, right: 10),
child: Card(
......@@ -81,7 +88,7 @@ class PlanItem extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
constraints: BoxConstraints(maxWidth: 95),
constraints: BoxConstraints(maxWidth: 126),
child: baseText(plans.name, 14, Color(0xff282828),
bold: true),
),
......@@ -91,7 +98,7 @@ class PlanItem extends StatelessWidget {
height: 0,
)
: Container(
constraints: BoxConstraints(maxWidth: 60),
// constraints: BoxConstraints(maxWidth: 60),
margin: EdgeInsets.only(left: 4),
child: Container(
padding: EdgeInsets.only(
......@@ -100,7 +107,7 @@ class PlanItem extends StatelessWidget {
borderRadius: BorderRadius.circular(2),
color: Color(0xffF0F9F7)),
alignment: Alignment.center,
child: baseText("${plans.operation_type}", 11,
child: baseText(showOprea, 11,
Color(0xff3FB5AF),
bold: true),
),
......
lib/ClueModel/page/plan/PlanModel.dart
View file @ aaa5519f
......@@ -61,7 +61,6 @@ class PlanModel extends BaseModel {
picLive.notifyView(planBean.data.ranks);
low = PlanModelInstance.getInstance().low;
high = PlanModelInstance.getInstance().high;
print("QWEEW${low} ${high}");
projectSelectIndex = PlanModelInstance.getInstance().projectSelectIndex;
......
lib/ClueModel/page/plan/PlanPage.dart
View file @ aaa5519f
......@@ -89,11 +89,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
stateBarHeight = MediaQueryData.fromWindow(window).padding.top;
topHeight = stateBarHeight + kToolbarHeight;
return Scaffold(
body: MediaQuery.removePadding(
removeTop: true,
context: context,
child: SafeArea(
top: false,
body: MediaQuery.removePadding(
removeTop: true,
context: context,
child: baseStateView(
MediaQuery.of(context).size.width,
MediaQuery.of(context).size.height,
......@@ -102,7 +100,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
_model.stateLive.notifyView(LOADING);
_model.init();
}, paddingTop: stateBarHeight + kToolbarHeight)),
));
);
}
Widget newHome() {
......
lib/commonModel/view/baseTabIndicator.dart
View file @ aaa5519f
......@@ -43,15 +43,14 @@ class _MD2Painter extends BoxPainter {
void paint(Canvas canvas, Offset offset, ImageConfiguration configuration) {
assert(configuration != null);
assert(configuration.size != null);
double width = (configuration.size.width-50) / 3.0 * 2.0;
Rect rect = Offset(
offset.dx +
configuration.size.width / 2 -
width / 2,
decoration.indicatorWidth / 2,
(configuration.size.height -
decoration.indicatorHeight -
decoration.indicatorPaddingBottom)) &
Size(width, decoration.indicatorHeight);
Size(decoration.indicatorWidth, decoration.indicatorHeight);
final Paint paint = Paint();
paint.color = decoration.indicatorColor;
......
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