Skip to content

G
gm_flutter
Commit 89fc2a16 authored by 朱翠翠's avatar 朱翠翠
Browse files
Options

Merge branches 'test' and 'zcc/flutter' of… 

Merge branches 'test' and 'zcc/flutter' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter
parents b0224d03 ce97a652
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 152 deletions
lib/ClueModel/page/levelOne/LevelOneItem.dart
View file @ 89fc2a16
...@@ -44,8 +44,8 @@ class LevelOneItem extends StatelessWidget { ...@@ -44,8 +44,8 @@ class LevelOneItem extends StatelessWidget {
return 127; return 127;
} else if (cards.cardType == "diary") { } else if (cards.cardType == "diary") {
double image = (cards.diary.images == null || double image = (cards.diary.images == null ||
cards.diary.images.isEmpty || cards.diary.images.isEmpty ||
cards.diary.images.length < 2) cards.diary.images.length < 2)
? 0 ? 0
: 175; : 175;
double text = 22 * (cards.diary.content.length / 22) + 24.5; double text = 22 * (cards.diary.content.length / 22) + 24.5;
...@@ -61,9 +61,12 @@ class LevelOneItem extends StatelessWidget { ...@@ -61,9 +61,12 @@ class LevelOneItem extends StatelessWidget {
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
Map<String, dynamic> map = {
"business_id": "${cards.doctor.doctor_id}",
};
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, cards.doctor.messageUrl, null, true); .jumpPage(context, cards.doctor.messageUrl, map, true);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 15, right: 15), margin: EdgeInsets.only(left: 15, right: 15),
...@@ -122,10 +125,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -122,10 +125,7 @@ class LevelOneItem extends StatelessWidget {
left: 57, left: 57,
bottom: 15, bottom: 15,
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context).size.width - 30 - 57,
.of(context)
.size
.width - 30 - 57,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
...@@ -160,10 +160,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -160,10 +160,7 @@ class LevelOneItem extends StatelessWidget {
left: 0, left: 0,
bottom: 0, bottom: 0,
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context).size.width - 30,
.of(context)
.size
.width - 30,
height: 0.5, height: 0.5,
color: Color(0xffE5E5E5), color: Color(0xffE5E5E5),
), ),
...@@ -181,9 +178,12 @@ class LevelOneItem extends StatelessWidget { ...@@ -181,9 +178,12 @@ class LevelOneItem extends StatelessWidget {
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
Map<String, dynamic> map = {
"business_id": "${cards.hospital.hosiptalId}",
};
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, cards.hospital.messageUrl, null, true); .jumpPage(context, cards.hospital.messageUrl, map, true);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 15, right: 15), margin: EdgeInsets.only(left: 15, right: 15),
...@@ -207,7 +207,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -207,7 +207,7 @@ class LevelOneItem extends StatelessWidget {
left: 57, left: 57,
top: 17.5, top: 17.5,
child: Container( child: Container(
width: MediaQuery.of(context).size.width-30-57, width: MediaQuery.of(context).size.width - 30 - 57,
child: baseText(cards.hospital.name, 15, Color(0xff333333), child: baseText(cards.hospital.name, 15, Color(0xff333333),
bold: true), bold: true),
), ),
...@@ -223,7 +223,8 @@ class LevelOneItem extends StatelessWidget { ...@@ -223,7 +223,8 @@ class LevelOneItem extends StatelessWidget {
baseText( baseText(
"${cards.hospital.minPrice}-${cards.hospital.maxPrice}", "${cards.hospital.minPrice}-${cards.hospital.maxPrice}",
15, 15,
Color(0xffFF5963),bold: true), Color(0xffFF5963),
bold: true),
], ],
), ),
), ),
...@@ -231,10 +232,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -231,10 +232,7 @@ class LevelOneItem extends StatelessWidget {
bottom: 15, bottom: 15,
left: 57, left: 57,
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context).size.width - 30 - 57,
.of(context)
.size
.width - 30 - 57,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
...@@ -279,10 +277,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -279,10 +277,7 @@ class LevelOneItem extends StatelessWidget {
left: 0, left: 0,
bottom: 0, bottom: 0,
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context).size.width - 30,
.of(context)
.size
.width - 30,
height: 0.5, height: 0.5,
color: Color(0xffE5E5E5), color: Color(0xffE5E5E5),
), ),
...@@ -326,9 +321,9 @@ class LevelOneItem extends StatelessWidget { ...@@ -326,9 +321,9 @@ class LevelOneItem extends StatelessWidget {
children: <Widget>[ children: <Widget>[
price == "暂无报价" price == "暂无报价"
? Container( ? Container(
width: 0, width: 0,
height: 0, height: 0,
) )
: baseText("¥", 12, Color(0xffFF5963)), : baseText("¥", 12, Color(0xffFF5963)),
baseText(price, price == "暂无报价" ? 13 : 15, baseText(price, price == "暂无报价" ? 13 : 15,
price == "暂无报价" ? Color(0xff999999) : Color(0xffFF5963)) price == "暂无报价" ? Color(0xff999999) : Color(0xffFF5963))
...@@ -356,10 +351,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -356,10 +351,7 @@ class LevelOneItem extends StatelessWidget {
left: 0, left: 0,
bottom: 0, bottom: 0,
child: Container( child: Container(
width: MediaQuery width: MediaQuery.of(context).size.width - 30,
.of(context)
.size
.width - 30,
height: 0.5, height: 0.5,
color: Color(0xffE5E5E5), color: Color(0xffE5E5E5),
), ),
...@@ -367,8 +359,13 @@ class LevelOneItem extends StatelessWidget { ...@@ -367,8 +359,13 @@ class LevelOneItem extends StatelessWidget {
], ],
), ),
).gestureDetector(() { ).gestureDetector(() {
RouterCenterImpl().findMainRouter().jumpPage(context, Map<String, dynamic> map = {
"level_two_plan_deatil", {"planId": cards.plan.plan_id}, false); "business_id": "${cards.plan.plan_id}",
"planId": cards.plan.plan_id
};
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_two_plan_deatil", map, false);
}); });
} }
...@@ -456,83 +453,83 @@ class LevelOneItem extends StatelessWidget { ...@@ -456,83 +453,83 @@ class LevelOneItem extends StatelessWidget {
cards.diary.user.userName, 13, Color(0xff999999)), cards.diary.user.userName, 13, Color(0xff999999)),
), ),
cards.diary.userLevel != null && cards.diary.userLevel != null &&
cards.diary.userLevel.levelIcon != null cards.diary.userLevel.levelIcon != null
? Container( ? Container(
width: 31, width: 31,
height: 12, height: 12,
child: CachedNetworkImage( child: CachedNetworkImage(
imageUrl: cards.diary.userLevel.levelIcon, imageUrl: cards.diary.userLevel.levelIcon,
), ),
) )
: Container( : Container(
width: 0, width: 0,
) )
], ],
), ),
), ),
(cards.diary.images == null || (cards.diary.images == null ||
cards.diary.images.isEmpty || cards.diary.images.isEmpty ||
cards.diary.images.length < 2) cards.diary.images.length < 2)
? Container( ? Container(
height: 0, height: 0,
) )
: Container( : Container(
margin: EdgeInsets.only(top: 12), margin: EdgeInsets.only(top: 12),
height: 163, height: 163,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
image: DecorationImage( image: DecorationImage(
fit: BoxFit.cover, fit: BoxFit.cover,
image: NetworkImage( image: NetworkImage(
cards.diary.images[0].imageHalf))), cards.diary.images[0].imageHalf))),
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Container( child: Container(
width: 65.5, width: 65.5,
height: 18, height: 18,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0x4c000000), color: Color(0x4c000000),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(4), bottomLeft: Radius.circular(4),
topRight: Radius.circular(2), topRight: Radius.circular(2),
)), )),
alignment: Alignment.center, alignment: Alignment.center,
child: baseText( child: baseText(
cards.diary.images[0].desc, 11, Colors.white), cards.diary.images[0].desc, 11, Colors.white),
),
),
), ),
), Container(
), width: 9,
Container(
width: 9,
),
Expanded(
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
cards.diary.images[1].imageHalf))),
alignment: Alignment.bottomLeft,
child: Container(
width: 65.5,
height: 18,
decoration: BoxDecoration(
color: Color(0x4c000000),
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(4),
topRight: Radius.circular(2),
)),
alignment: Alignment.center,
child: baseText(
cards.diary.images[1].desc, 11, Colors.white),
), ),
), Expanded(
) child: Container(
], decoration: BoxDecoration(
)), image: DecorationImage(
fit: BoxFit.cover,
image: NetworkImage(
cards.diary.images[1].imageHalf))),
alignment: Alignment.bottomLeft,
child: Container(
width: 65.5,
height: 18,
decoration: BoxDecoration(
color: Color(0x4c000000),
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(4),
topRight: Radius.circular(2),
)),
alignment: Alignment.center,
child: baseText(
cards.diary.images[1].desc, 11, Colors.white),
),
),
)
],
)),
Container( Container(
margin: EdgeInsets.only(top: 12.5, bottom: 12), margin: EdgeInsets.only(top: 12.5, bottom: 12),
child: Text( child: Text(
...@@ -565,7 +562,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -565,7 +562,7 @@ class LevelOneItem extends StatelessWidget {
Container( Container(
margin: EdgeInsets.only(left: 5, right: 20), margin: EdgeInsets.only(left: 5, right: 20),
child: child:
baseText("${cards.diary.viewNum}", 12, Color(0xff999999)), baseText("${cards.diary.viewNum}", 12, Color(0xff999999)),
), ),
Container( Container(
width: 14, width: 14,
...@@ -585,7 +582,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -585,7 +582,7 @@ class LevelOneItem extends StatelessWidget {
Container( Container(
margin: EdgeInsets.only(left: 5, right: 20), margin: EdgeInsets.only(left: 5, right: 20),
child: child:
baseText("${cards.diary.voteNum}", 12, Color(0xff999999)), baseText("${cards.diary.voteNum}", 12, Color(0xff999999)),
) )
], ],
), ),
......
lib/ClueModel/page/levelOne/LevelOneList.dart
View file @ 89fc2a16
...@@ -140,15 +140,17 @@ class LevelOneListState extends State<LevelOneList> ...@@ -140,15 +140,17 @@ class LevelOneListState extends State<LevelOneList>
} }
}, },
compare: () { compare: () {
Map<String, dynamic> map = {
"business_id": "${widget.planId}",
"planId": widget.planId,
"planType": widget.index == 0 ? 1 : 2
};
RouterCenterImpl().findMainRouter().jumpPage( RouterCenterImpl().findMainRouter().jumpPage(
context, context,
widget.index == 0 widget.index == 0
? "level_one_plan_compare" ? "level_one_plan_compare"
: "level_two_plan_compare", : "level_two_plan_compare",
{ map,
"planId": widget.planId,
"planType": widget.index == 0 ? 1 : 2
},
false); false);
}, },
); );
......
lib/ClueModel/page/levelOne/LevelOnePage.dart
View file @ 89fc2a16
...@@ -319,10 +319,9 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -319,10 +319,9 @@ class LevelOneState extends BaseState<LevelOnePage>
child: baseText( child: baseText(
"${(_model.planoverItem.positiveRate.contains(".") ? _model.planoverItem.positiveRate.split(".")[0] : _model.planoverItem.positiveRate).replaceAll("%", "")}", "${(_model.planoverItem.positiveRate.contains(".") ? _model.planoverItem.positiveRate.split(".")[0] : _model.planoverItem.positiveRate).replaceAll("%", "")}",
20, 20,
Color(0xffFF5963), Color(0xffFF5963)),
bold: true),
), ),
baseText("%", 10, Color(0xffFF5963)), baseText("%", 11, Color(0xffFF5963)),
], ],
), ),
), ),
...@@ -367,7 +366,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -367,7 +366,7 @@ class LevelOneState extends BaseState<LevelOnePage>
fontSize: 14, fontSize: 14,
color: Color(0xff282828), color: Color(0xff282828),
fontStyle: FontStyle.normal, fontStyle: FontStyle.normal,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w400),
), ),
), ),
Container( Container(
...@@ -416,8 +415,7 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -416,8 +415,7 @@ class LevelOneState extends BaseState<LevelOnePage>
Widget explain() { Widget explain() {
List<Widget> list = []; List<Widget> list = [];
list.add(Container( list.add(Container(
height: 18, height: 31,
margin: EdgeInsets.only(top: 0, bottom: 10),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
baseText("项目说明", 15, Color(0xff282828)), baseText("项目说明", 15, Color(0xff282828)),
...@@ -426,11 +424,13 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -426,11 +424,13 @@ class LevelOneState extends BaseState<LevelOnePage>
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
RouterCenterImpl().findMainRouter().jumpPage( Map<String, dynamic> map = {
context, "business_id": "${widget.planId}",
"level_one_plan_instruction", "planId": widget.planId
{"planId": widget.planId}, };
false); RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_one_plan_instruction", map, false);
}, },
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: baseText("了解更多", 12, Color(0xff3FB5AF)), child: baseText("了解更多", 12, Color(0xff3FB5AF)),
...@@ -439,13 +439,9 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -439,13 +439,9 @@ class LevelOneState extends BaseState<LevelOnePage>
), ),
)); ));
if (_model.planoverItem != null) { if (_model.planoverItem != null) {
int index = 0;
_model.planoverItem.explanationAttrs.forEach((element) { _model.planoverItem.explanationAttrs.forEach((element) {
list.add(Container( list.add(Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(bottom: 15),
bottom: index == _model.planoverItem.explanationAttrs.length - 1
? 0
: 15),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -514,11 +510,14 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -514,11 +510,14 @@ class LevelOneState extends BaseState<LevelOnePage>
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
RouterCenterImpl().findMainRouter().jumpPage( Map<String, dynamic> map = {
context, "business_id": "${widget.planId}",
"level_two_plan_compare", "planId": widget.planId,
{"planType": 1, "planId": widget.planId}, "planType": 1
false); };
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_two_plan_compare", map, false);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 21), margin: EdgeInsets.only(left: 21),
...@@ -559,7 +558,6 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -559,7 +558,6 @@ class LevelOneState extends BaseState<LevelOnePage>
}, },
child: Container( child: Container(
width: ScreenUtil().setWidth(137), width: ScreenUtil().setWidth(137),
margin: EdgeInsets.only(left: 20),
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xff51CDC7), color: Color(0xff51CDC7),
...@@ -578,14 +576,6 @@ class LevelOneState extends BaseState<LevelOnePage> ...@@ -578,14 +576,6 @@ class LevelOneState extends BaseState<LevelOnePage>
.jumpPage(context, "show_login", null, true); .jumpPage(context, "show_login", null, true);
return; return;
} }
Map<String, dynamic> map = {
"page_name": "level_one_plan_deatil",
"referrer_link": [],
"popup_name": "interested_plan"
};
RouterCenterImpl()
.findMainRouter()
.buriedEvent("popup_view", map);
DiscussLowPricePopView.showPopView( DiscussLowPricePopView.showPopView(
context, widget.PAGE_NAME, "${widget.planId}", "", ""); context, widget.PAGE_NAME, "${widget.planId}", "", "");
}, },
......
lib/ClueModel/page/levelTwo/LevelTwoPage.dart
View file @ 89fc2a16
...@@ -391,11 +391,13 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -391,11 +391,13 @@ class LevelTwoState extends BaseState<LevelTwoPage>
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
RouterCenterImpl().findMainRouter().jumpPage( Map<String, dynamic> map = {
context, "business_id": "${widget.planId}",
"level_one_plan_instruction", "planId": widget.planId,
{"planId": widget.planId}, };
false); RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_one_plan_instruction", map, false);
}, },
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: baseText("了解更多", 12, Color(0xff3FB5AF)), child: baseText("了解更多", 12, Color(0xff3FB5AF)),
...@@ -471,11 +473,14 @@ class LevelTwoState extends BaseState<LevelTwoPage> ...@@ -471,11 +473,14 @@ class LevelTwoState extends BaseState<LevelTwoPage>
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
RouterCenterImpl().findMainRouter().jumpPage( Map<String, dynamic> map = {
context, "business_id": "${widget.planId}",
"level_two_plan_compare", "planId": widget.planId,
{"planType": 2, "planId": widget.planId}, "planType": 2
false); };
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_two_plan_compare", map, false);
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 21), margin: EdgeInsets.only(left: 21),
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ 89fc2a16
...@@ -163,11 +163,14 @@ class PlanItem extends StatelessWidget { ...@@ -163,11 +163,14 @@ class PlanItem extends StatelessWidget {
} }
RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map); RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map);
RouterCenterImpl().findMainRouter().jumpPage( Map<String, dynamic> buriedMap = {
context, "business_id": "${plans.id}",
"level_one_plan_detail", "planId": plans.id,
{"planId": plans.id, "title": "${plans.name}"}, "title": "${plans.name}"
false); };
RouterCenterImpl()
.findMainRouter()
.jumpPage(context, "level_one_plan_detail", buriedMap, false);
})); }));
} }
} }
lib/ClueModel/page/plan/PlanPage.dart
View file @ 89fc2a16
...@@ -202,7 +202,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -202,7 +202,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
leftPos: data.data[0], leftPos: data.data[0],
topPos: data.data[1], topPos: data.data[1],
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
maxHeight: 45*_model.sortList.length, maxHeight: 45 * _model.sortList.length,
listener: sortMenuListener, listener: sortMenuListener,
child: SortView(_model.sortList, _model.sortPos, (index) { child: SortView(_model.sortList, _model.sortPos, (index) {
clickIndexOther(1); clickIndexOther(1);
...@@ -444,7 +444,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -444,7 +444,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
"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}",
}; };
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, "favor_plan", map, false); .jumpPage(context, "favor_plan", map, false);
...@@ -473,7 +475,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -473,7 +475,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
"rank_type": "1", "rank_type": "1",
"id": "${data.data[1].id}", "id": "${data.data[1].id}",
"title": "${data.data[1].name}", "title": "${data.data[1].name}",
"business_id": "${data.data[1].id}",
}; };
RouterCenterImpl() RouterCenterImpl()
.findMainRouter() .findMainRouter()
.jumpPage(context, "hot_plan", map, false); .jumpPage(context, "hot_plan", map, false);
......
lib/ClueModel/server/entity/PlanOverviewBean.dart
View file @ 89fc2a16
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
class PlanOverViewBean { class PlanOverViewBean {
int error; int error;
String message; String message;
Map extra; Null extra;
Map errorExtra; Null errorExtra;
UserType userType; UserType userType;
PlanOverData data; PlanOverData data;
......
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