diff --git a/lib/model/manager/article_QR_code_model.dart b/lib/model/manager/article_QR_code_model.dart index 33421476..c38f285a 100644 --- a/lib/model/manager/article_QR_code_model.dart +++ b/lib/model/manager/article_QR_code_model.dart @@ -26,25 +26,32 @@ class ArticleQRModel { class AppArticleOutQRCodeVo { int id; - int residentId; - String residentName; + String roomName; + int applicantId; + String applicantName; String effectiveTime; AppArticleOutQRCodeVo( - {this.id, this.residentId, this.residentName, this.effectiveTime}); + {this.id, + this.roomName, + this.applicantId, + this.applicantName, + this.effectiveTime}); AppArticleOutQRCodeVo.fromJson(Map json) { id = json['id']; - residentId = json['residentId']; - residentName = json['residentName']; + roomName = json['roomName']; + applicantId = json['applicantId']; + applicantName = json['applicantName']; effectiveTime = json['effectiveTime']; } Map toJson() { final Map data = new Map(); data['id'] = this.id; - data['residentId'] = this.residentId; - data['residentName'] = this.residentName; + data['roomName'] = this.roomName; + data['applicantId'] = this.applicantId; + data['applicantName'] = this.applicantName; data['effectiveTime'] = this.effectiveTime; return data; } diff --git a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart index 1d4893f1..8307b0c6 100644 --- a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart +++ b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart @@ -11,7 +11,6 @@ import 'package:qr_flutter/qr_flutter.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; import 'package:akuCommunity/provider/user_provider.dart'; -import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/dotted_line.dart'; @@ -146,7 +145,6 @@ class DetoCodePage extends StatelessWidget { @override Widget build(BuildContext context) { - UserProvider userProvider = Provider.of(context); return BeeScaffold( title: '出户二维码', body: Container( @@ -156,10 +154,9 @@ class DetoCodePage extends StatelessWidget { Column( children: [ SizedBox(height: 192.w - kToolbarHeight), - _header(BeeParse.getEstateName( - userProvider.userDetailModel.estateNames[0])), + _header(model.appArticleOutQRCodeVo.roomName), SizedBox(height: 32.w), - _card(model.appArticleOutQRCodeVo.residentName, + _card(model.appArticleOutQRCodeVo.applicantName, model.appArticleOutQRCodeVo.effectiveTime), ], ), diff --git a/lib/pages/visitor_access_page/visitor_access_page.dart b/lib/pages/visitor_access_page/visitor_access_page.dart index 6846c64a..0033d5e3 100644 --- a/lib/pages/visitor_access_page/visitor_access_page.dart +++ b/lib/pages/visitor_access_page/visitor_access_page.dart @@ -1,4 +1,8 @@ // Flutter imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; +import 'package:akuCommunity/utils/bee_parse.dart'; +import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -30,79 +34,126 @@ class _VisitorAccessPageState extends State { TextEditingController _userCarNum = new TextEditingController(); DateTime dateTime; int _selectSex; - Widget _house() { - return Container( - padding: EdgeInsets.only( - left: 36.w, - right: 36.w, - top: 32.w, - ), + // Widget _house() { + // return Container( + // padding: EdgeInsets.only( + // left: 36.w, + // right: 36.w, + // top: 32.w, + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // '来访房屋', + // style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), + // ), + // SizedBox(height: 32.w), + // Container( + // child: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Image.asset( + // AssetsImage.HOUSE, + // height: 60.w, + // width: 60.w, + // ), + // SizedBox(width: 40.w), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // '宁波华茂悦峰', + // style: TextStyle( + // fontWeight: FontWeight.w600, + // fontSize: 34.sp, + // color: Color(0xff333333)), + // ), + // SizedBox(height: 10.w), + // Text( + // '1幢-1单元-702室', + // style: TextStyle( + // fontWeight: FontWeight.w600, + // fontSize: 34.sp, + // color: Color(0xff333333)), + // ) + // ], + // ), + // ], + // ), + // Container( + // alignment: Alignment.center, + // padding: EdgeInsets.symmetric( + // vertical: 14.w, + // horizontal: 21.w, + // ), + // decoration: BoxDecoration( + // color: Color(0xffFEC200), + // borderRadius: BorderRadius.all(Radius.circular(4)), + // ), + // child: Text( + // '邀请客户填写', + // style: TextStyle( + // fontWeight: FontWeight.w600, + // fontSize: 28.sp, + // color: Color(0xff333333)), + // ), + // ), + // ], + // ), + // ), + // SizedBox(height: 26.w), + // Divider(), + // ], + // ), + // ); + // } + + Widget _buildHouseCard( + String title, + String detail, + ) { + return Padding( + padding: EdgeInsets.all(32.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - '来访房屋', - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 32.w), - Container( + '报修房屋'.text.black.size(28.sp).make(), + 32.w.heightBox, + GestureDetector( + onTap: () { + MyHousePage().to(); + }, child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Image.asset( - AssetsImage.HOUSE, - height: 60.w, - width: 60.w, - ), - SizedBox(width: 40.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '宁波华茂悦峰', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 34.sp, - color: Color(0xff333333)), - ), - SizedBox(height: 10.w), - Text( - '1幢-1单元-702室', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 34.sp, - color: Color(0xff333333)), - ) - ], - ), - ], + Image.asset( + R.ASSETS_ICONS_HOUSE_PNG, + width: 60.w, + height: 60.w, ), - Container( - alignment: Alignment.center, - padding: EdgeInsets.symmetric( - vertical: 14.w, - horizontal: 21.w, - ), - decoration: BoxDecoration( - color: Color(0xffFEC200), - borderRadius: BorderRadius.all(Radius.circular(4)), - ), - child: Text( - '邀请客户填写', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 28.sp, - color: Color(0xff333333)), + 40.w.widthBox, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + title.text.black.size(32.sp).bold.make(), + 10.w.heightBox, + detail.text.black.size(32.sp).bold.make() + ], ), ), + Icon( + CupertinoIcons.chevron_forward, + size: 40.w, + ), ], - ), + ).material(color: Colors.transparent), ), - SizedBox(height: 26.w), - Divider(), + 24.w.heightBox, + BeeDivider.horizontal(), ], ), ); @@ -336,7 +387,12 @@ class _VisitorAccessPageState extends State { }, child: Column( children: [ - _house(), + _buildHouseCard( + kEstateName, + userProvider.userDetailModel.estateNames.isEmpty + ? '' + : BeeParse.getEstateName( + userProvider.userDetailModel.estateNames[0])), _input('访客姓名', '请输入访客姓名', _userName), _sexSelect(), _input('是否驾车', '请输入,例如浙A88888(没有驾车可不填)', _userCarNum),