From e46c38b516b131a3aa701922536fd1301182f14b Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Thu, 5 Nov 2020 16:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E6=88=B7=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/outdoor/ic_image.png | Bin 0 -> 1371 bytes assets/outdoor/ic_phoneblue.png | Bin 0 -> 3534 bytes assets/outdoor/ic_transport.png | Bin 0 -> 1357 bytes assets/outdoor/ic_weight.png | Bin 0 -> 2730 bytes .../outdoor_models/outdoor_model.dart | 6 +- lib/style/app_style.dart | 4 + .../items_outdoor/items_outdoor_card.dart | 396 +++++++++++------- .../items_outdoor_details_page.dart | 142 +++++++ .../items_outdoor/items_outdoor_page.dart | 2 +- 9 files changed, 392 insertions(+), 158 deletions(-) create mode 100644 assets/outdoor/ic_image.png create mode 100644 assets/outdoor/ic_phoneblue.png create mode 100644 assets/outdoor/ic_transport.png create mode 100644 assets/outdoor/ic_weight.png create mode 100644 lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart diff --git a/assets/outdoor/ic_image.png b/assets/outdoor/ic_image.png new file mode 100644 index 0000000000000000000000000000000000000000..c25f1af852941f51ea67f7d8031990e183fe623c GIT binary patch literal 1371 zcmaKsdpOg30LH&AxsNSjuFcXAxs{`*kjvcH(x@i1<)AgU>1<{^nCWeG>=IRBjg&Uv5bec$Kv-}~2_9gO#bX&7k$0AKOv@jkN{;C%O9!(5Fx!DEMxiBCadA6y zbIGIJ(zoLmS5WTp?p5|&)OuP!=XBD~l&#o{#&}|R$UQXcGRqims6B3_btVce+kN-N z_wKgnJEs!Q=X;;b|JEy8r6(<}jW4V&2Wcz1Y*VD%iFI`F@YZ$kP@(vXf_t^28Ej>( z=@0*b{8ylm5WP|&3rrmQI)uZ>5AaCU393$_=_*6izJ}Lr%N4m<4TeIR(kD7t>385f zEV>FrQ&+Y=urq<6w8&xl$vX97SCTc&29%v(m=dBHrmUK7BuZ(w1=;GPs*{JeB70Fl zn|S{GxpO7q)P67?fSrjSOLxidt{us({WFzHrG``zR$J>CUbu^sy^!G*q=BdLJL-L8n@JdG-8j7#u zFg;ogo0u2e_Y-aPr54=KomvQCPS;eLX;)a&_CtZ43aIUsp)btDoUvjfwI}83Eb>6p z{AuH#;`fx`Fg8nhi>nv7!B%`#@K|9&&w9Ge7ox)&1|0@ZPft!xo zo0`d^vqambo#pt7qzBiJ8z?jF?Bdm#sc)JR>f9tF(p}yoay|!oKYOHo3!;w#-3z4( z64l-SPys{~DCKy&rVVXLS)^~76N~G`Y|eJ?&Q>LuA9xp8v6|3C4#o5vFE)Nnblm z{INwd=aLi{cHQ+9h=}3(vDs{Q5|Ow^8>ISVB4au~&K=%U(KnXqGrpqJFKfP+z5g5tvz+EoqtMC1A#VqOV7I&|lU42%A~J-IAOnPaCp zd&8$=nQp13=(gZoDz`&V+L?D4)PeVV$+v=EW|Wjxb(&9dni3Xpyw|OPk`$Q{WACm$ z`CZ6Lk~dvZ6f+O^x}djxO)M7IyqlTPQ4rZ-zr~Zu6U<{LP?rTYGagSE8$-Nl?T_F& zotRg%Uz+DFNafnv+B!PIA{=IkFHV;2P@S`_*{?xY2Box^4w~eMuz{w9scw*gBS!^S ziee-dmsYH)+&I1ALNKi1YuOjWC=afA{qJXdh+zPcK>}Am7Sy$rZIKSW9lLR;3om~} zOFr6boB8AD3jkXsB{SI4=9#w%_GmXhk%PI)Qvg#(J`*#wUgj}wm6`q@ek1upDd__g Rz}+}a5a5Hy-uEK2{s!i`fKmVe literal 0 HcmV?d00001 diff --git a/assets/outdoor/ic_phoneblue.png b/assets/outdoor/ic_phoneblue.png new file mode 100644 index 0000000000000000000000000000000000000000..3a7bb1b1bf63f3cef90a459f7391260af91bef02 GIT binary patch literal 3534 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 literal 0 HcmV?d00001 diff --git a/lib/mock_models/outdoor_models/outdoor_model.dart b/lib/mock_models/outdoor_models/outdoor_model.dart index 7c806a5..052e500 100644 --- a/lib/mock_models/outdoor_models/outdoor_model.dart +++ b/lib/mock_models/outdoor_models/outdoor_model.dart @@ -79,7 +79,7 @@ DateTime datetime; identify: '业主', items: ItemDetails( itemname: '家具', - weight: 40, + weight: 60, way: '搬家公司', imagepath: [ R.ASSETS_OUTDOOR_ITME1_PNG, @@ -98,7 +98,7 @@ DateTime datetime; identify: '业主', items: ItemDetails( itemname: '家具', - weight: 40, + weight: 80, way: '搬家公司', imagepath: [ R.ASSETS_OUTDOOR_ITME1_PNG, @@ -117,7 +117,7 @@ DateTime datetime; identify: '业主', items: ItemDetails( itemname: '家具', - weight: 40, + weight: 120, way: '搬家公司', imagepath: [ R.ASSETS_OUTDOOR_ITME1_PNG, diff --git a/lib/style/app_style.dart b/lib/style/app_style.dart index abf1225..ba177a6 100644 --- a/lib/style/app_style.dart +++ b/lib/style/app_style.dart @@ -30,4 +30,8 @@ class AppStyle { color: primaryTextColor, fontSize: 28.sp, fontWeight: FontWeight.bold); final minorStyle = TextStyle( color: minorTextColor, fontSize: 24.sp, fontWeight: FontWeight.normal); + final secondaryTextStyle = TextStyle( + color: AppStyle.minorTextColor, + fontSize: 28.sp, + fontWeight: FontWeight.normal); } diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart index fbb98f1..5017653 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart @@ -1,17 +1,21 @@ import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:get/get.dart'; class ItemsOutdoorCard extends StatefulWidget { final ItemsOutdoorModel cardModel; + final bool isdetail; ItemsOutdoorCard({ Key key, @required this.cardModel, + this.isdetail = false, }) : super(key: key); @override @@ -34,166 +38,250 @@ class _ItemsOutdoorCardState extends State { Widget build(BuildContext context) { TextStyle _textStyle = TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp); - return AkuButton( - child: Container( - color: Color(0xFFFFFFFF), - margin: EdgeInsets.only(top: 16.w), - padding: EdgeInsets.only(left: 24.w, right: 24.w, bottom: 24.w), - child: Column(children: [ - Container( - alignment: Alignment.centerLeft, - height: 88.w, - width: double.infinity, - child: Row( - children: [ - Container( + return Container( + color: Color(0xFFFFFFFF), + margin: EdgeInsets.only(top: 16.w), + padding: EdgeInsets.only(left: 24.w, right: 24.w), + child: Column(children: [ + widget.isdetail + ? Container( + alignment: Alignment.centerLeft, + height: 90.w, + width: double.infinity, + child: Row( + children: [ + Text( + '出户信息', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 36.sp, + fontWeight: FontWeight.bold), + ), + Spacer(), + Text( + ItemsOutdoorModel.outdoorStatusMap[_cardModel.status], + style: TextStyle( + color: _cardModel.status == OUTDOORSTATUS.CANCELLATION + ? Color(0xFF999999) + : Color(0xFFFF4501), + fontSize: 24.sp, + fontWeight: FontWeight.bold), + ), + ], + ), + ) + : Container( + alignment: Alignment.centerLeft, + height: 88.w, + width: double.infinity, + child: Row( + children: [ + Container( + alignment: Alignment.center, + width: 112.w, + height: 40.w, + decoration: BoxDecoration( + border: + Border.all(color: Color(0xFF3F8FFE), width: 2.w), + ), + child: Text( + '物品出户', + style: TextStyle( + color: Color(0xFF3F8FFE), + fontSize: 20.sp, + fontWeight: FontWeight.bold), + ), + ), + AkuBox.w(16), + Text( + _datetime, + style: TextStyle( + color: AppStyle.minorTextColor, + fontSize: 22.sp, + ), + ), + Spacer(), + Text( + ItemsOutdoorModel.outdoorStatusMap[_cardModel.status], + style: TextStyle( + color: _cardModel.status == OUTDOORSTATUS.CANCELLATION + ? Color(0xFF999999) + : Color(0xFFFF4501), + fontSize: 24.sp, + fontWeight: FontWeight.bold), + ), + ], + ), + ), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_HOME_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '小区名称', + style: _textStyle, + ), + Spacer(), + Text( + _cardModel.communityname, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(12), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_ADDRESS_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text('详细地址', style: _textStyle), + Spacer(), + Text( + _cardModel.adress, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(12), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_GOOUT_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '出户人', + style: _textStyle, + ), + Spacer(), + Text( + _cardModel.name, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(12), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_PEOPLE_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '身份', + style: _textStyle, + ), + Spacer(), + Text( + _cardModel.identify, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(12), + Row( + children: [ + Image.asset(R.ASSETS_OUTDOOR_IC_CHUHU_PNG,width: 40.w,height: 40.w,), + Text( + '出户物品', + style: _textStyle, + ), + Spacer(), + Text( + _cardModel.items.itemname, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(12), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_TIME_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '出户时间', + style: _textStyle, + ), + Spacer(), + Text( + _cardModel.outtime, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(24), + Divider( + height: 1.w, + ), + widget.isdetail + ? AkuButton( + onPressed: () {}, + child: Container( alignment: Alignment.center, - width: 112.w, - height: 40.w, - decoration: BoxDecoration( - border: Border.all(color: Color(0xFF3F8FFE), width: 2.w), - ), - child: Text( - '物品出户', - style: TextStyle( - color: Color(0xFF3F8FFE), - fontSize: 20.sp, - fontWeight: FontWeight.bold), + height: 96.w, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_PHONEBLUE_PNG, + width: 38.w, + height: 39.w, + ), + AkuBox.w(16), + Text('联系业主', + style: TextStyle( + color: Color(0xFF3F8FFE), + fontSize: 28.sp, + fontWeight: FontWeight.bold)), + ], ), ), - AkuBox.w(16), - Text( - _datetime, - style: TextStyle( - color: AppStyle.minorTextColor, - fontSize: 22.sp, + ) + : Container( + height: 112.w, + alignment: Alignment.centerRight, + child: AkuButton( + onPressed: () { + Get.to(ItemsOutdoorDetailsPage( + cardMedel: _cardModel, + )); + }, + child: Container( + alignment: Alignment.center, + width: 160.w, + height: 64.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.w), + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + AppStyle.primaryColor, + AppStyle.minorColor + ])), + child: Text( + '查看详情', + style: AppStyle().primaryStyle, + ), ), ), - Spacer(), - Text( - ItemsOutdoorModel.outdoorStatusMap[_cardModel.status], - style: TextStyle( - color: _cardModel.status == OUTDOORSTATUS.CANCELLATION - ? Color(0xFF999999) - : Color(0xFFFF4501), - fontSize: 24.sp, - fontWeight: FontWeight.bold), - ), - ], - ), - ), - Row( - children: [ - Image.asset( - R.ASSETS_OUTDOOR_IC_HOME_PNG, - width: 40.w, - height: 40.w, - ), - AkuBox.w(4), - Text( - '小区名称', - style: _textStyle, - ), - Spacer(), - Text( - _cardModel.communityname, - style: AppStyle().primaryStyle, - ), - ], - ), - AkuBox.h(12), - Row( - children: [ - Image.asset( - R.ASSETS_OUTDOOR_IC_ADDRESS_PNG, - width: 40.w, - height: 40.w, - ), - AkuBox.w(4), - Text('详细地址', style: _textStyle), - Spacer(), - Text( - _cardModel.adress, - style: AppStyle().primaryStyle, - ), - ], - ), - AkuBox.h(12), - Row( - children: [ - Image.asset( - R.ASSETS_OUTDOOR_IC_GOOUT_PNG, - width: 40.w, - height: 40.w, - ), - AkuBox.w(4), - Text( - '出户人', - style: _textStyle, - ), - Spacer(), - Text( - _cardModel.name, - style: AppStyle().primaryStyle, - ), - ], - ), - AkuBox.h(12), - Row( - children: [ - Image.asset( - R.ASSETS_OUTDOOR_IC_PEOPLE_PNG, - width: 40.w, - height: 40.w, - ), - AkuBox.w(4), - Text( - '身份', - style: _textStyle, - ), - Spacer(), - Text( - _cardModel.identify, - style: AppStyle().primaryStyle, - ), - ], - ), - AkuBox.h(12), - Row( - children: [ - Text( - '出户物品', - style: _textStyle, - ), - Spacer(), - Text( - _cardModel.items.itemname, - style: AppStyle().primaryStyle, - ), - ], - ), - AkuBox.h(12), - Row( - children: [ - Image.asset( - R.ASSETS_OUTDOOR_IC_TIME_PNG, - width: 40.w, - height: 40.w, - ), - AkuBox.w(4), - Text( - '出户时间', - style: _textStyle, - ), - Spacer(), - Text( - _cardModel.outtime, - style: AppStyle().primaryStyle, ), - ], - ), - ]), - ), + ]), ); } } diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart new file mode 100644 index 0000000..a233a0f --- /dev/null +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart @@ -0,0 +1,142 @@ +import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_card.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_community_manager/const/resource.dart'; + +class ItemsOutdoorDetailsPage extends StatefulWidget { + final ItemsOutdoorModel cardMedel; + ItemsOutdoorDetailsPage({Key key, @required this.cardMedel}) + : super(key: key); + + @override + _ItemsOutdoorDetailsPageState createState() => + _ItemsOutdoorDetailsPageState(); +} + +class _ItemsOutdoorDetailsPageState extends State { + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '出户详情', + body: ListView( + children: [ + ItemsOutdoorCard( + cardModel: widget.cardMedel, + isdetail: true, + ), + Container( + color: Color(0xFFFFFFFF), + margin: EdgeInsets.only(top: 16.w), + padding: EdgeInsets.only(top: 24.w, left: 32.w, right: 32.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '物品信息', + style: AppStyle().barTitleStyle, + ), + AkuBox.h(16), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_CHUHU_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '出户物品', + style: AppStyle().secondaryTextStyle, + ), + Spacer(), + Text( + widget.cardMedel.items.itemname, + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(16), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_WEIGHT_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '物品重量', + style: AppStyle().secondaryTextStyle, + ), + Spacer(), + Text( + widget.cardMedel.items.weight < 50.0 + ? '<50kg' + : '${widget.cardMedel.items.weight}kg', + style: AppStyle().primaryStyle, + ), + ], + ), + AkuBox.h(16), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_TRANSPORT_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '搬运方式', + style: AppStyle().secondaryTextStyle, + ), + Spacer(), + Text( + widget.cardMedel.items.way, + style: AppStyle().primaryStyle, + ) + ], + ), + AkuBox.h(16), + Row( + children: [ + Image.asset( + R.ASSETS_OUTDOOR_IC_IMAGE_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text( + '图片信息', + style: AppStyle().secondaryTextStyle, + ), + Spacer(), + ], + ), + AkuBox.h(16), + Wrap( + spacing: 16.w, + children: widget.cardMedel.items.imagepath + .map( + (e) => ClipRRect( + borderRadius: BorderRadius.circular(4.w), + child: Image.asset( + e, + width: 218.w, + height: 218.w, + )), + ) + .toList(), + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart index cd5c3c4..f3bfb6e 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart @@ -45,7 +45,7 @@ void dispose() { List _selectModels = _outdoorModels.getOutdoorModels(index); return ListView( padding: EdgeInsets.only(left: 32.w,right: 32.w), - children: _selectModels.map((e) => ItemsOutdoorCard(cardModel:e)).toList(), + children: _selectModels.map((e) => ItemsOutdoorCard(cardModel:e,isdetail: false,)).toList(), ); } }