Skip to content

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

Merge branch 'zx/gmFlutter' into 'test' 

Zx/gm flutter

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