diff --git a/assets/manage/add.png b/assets/manage/add.png new file mode 100644 index 0000000..fdb027a Binary files /dev/null and b/assets/manage/add.png differ diff --git a/lib/const/api.dart b/lib/const/api.dart index 58f0030..797dd1d 100644 --- a/lib/const/api.dart +++ b/lib/const/api.dart @@ -191,6 +191,9 @@ class _Manage { ///管家app 包裹代收：提醒领取 String get packageManageRemind => '/user/packageCollection/remind'; + + ///管家app 包裹代收：添加包裹代收信息 + String get addPackage => '/user/packageCollection/insert'; } class _Upload { diff --git a/lib/models/manager/package_manage/package_manage_list_model.dart b/lib/models/manager/package_manage/package_manage_list_model.dart index a365916..f3310ca 100644 --- a/lib/models/manager/package_manage/package_manage_list_model.dart +++ b/lib/models/manager/package_manage/package_manage_list_model.dart @@ -4,9 +4,10 @@ class PackageManageListModel { String addresseeName; String addresseeTel; String address; + String placePosition; int status; - Null receiveDate; - String createDate; + DateTime receiveDate; + DateTime createDate; PackageManageListModel( {this.id, @@ -14,6 +15,7 @@ class PackageManageListModel { this.addresseeName, this.addresseeTel, this.address, + this.placePosition, this.status, this.receiveDate, this.createDate}); @@ -24,6 +26,7 @@ class PackageManageListModel { addresseeName = json['addresseeName']; addresseeTel = json['addresseeTel']; address = json['address']; + placePosition = json['placePosition']; status = json['status']; receiveDate = json['receiveDate']; createDate = json['createDate']; @@ -36,6 +39,7 @@ class PackageManageListModel { data['addresseeName'] = this.addresseeName; data['addresseeTel'] = this.addresseeTel; data['address'] = this.address; + data['placePosition'] = this.placePosition; data['status'] = this.status; data['receiveDate'] = this.receiveDate; data['createDate'] = this.createDate; diff --git a/lib/ui/manage_pages/packages_manage/add_package_page.dart b/lib/ui/manage_pages/packages_manage/add_package_page.dart new file mode 100644 index 0000000..bc76007 --- /dev/null +++ b/lib/ui/manage_pages/packages_manage/add_package_page.dart @@ -0,0 +1,194 @@ +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class AddPackagePage extends StatefulWidget { + AddPackagePage({Key key}) : super(key: key); + + @override + _AddPackagePageState createState() => _AddPackagePageState(); +} + +class _AddPackagePageState extends State { + TextEditingController _nameController; + TextEditingController _phoneController; + TextEditingController _addressController; + TextEditingController _codeController; + TextEditingController _placeController; + bool get canSubmit { + if (TextUtil.isEmpty(_nameController.text)) { + BotToast.showText(text: '收件人姓名不能为空！'); + return false; + } + if (TextUtil.isEmpty(_phoneController.text)) { + BotToast.showText(text: '收件人联系方式不能为空！'); + return false; + } else if (!_phoneFormat(_phoneController.text)) { + BotToast.showText(text: '收件人联系方式格式错误！'); + return false; + } + if (TextUtil.isEmpty(_addressController.text)) { + BotToast.showText(text: '楼层地址不能为空！'); + return false; + } + if (TextUtil.isEmpty(_codeController.text)) { + BotToast.showText(text: '包裹单号不能为空！'); + return false; + } + if (TextUtil.isEmpty(_placeController.text)) { + BotToast.showText(text: '放置位置不能为空！'); + return false; + } + return true; + } + + bool _phoneFormat(String phone) { + if ((phone.length != 11) || (phone.substring(0, 1) != '1')) { + return false; + } + return true; + } + + @override + void initState() { + super.initState(); + _nameController = TextEditingController(); + _phoneController = TextEditingController(); + _addressController = TextEditingController(); + _codeController = TextEditingController(); + _placeController = TextEditingController(); + } + + @override + void dispose() { + _nameController?.dispose(); + _phoneController?.dispose(); + _addressController?.dispose(); + _codeController?.dispose(); + _phoneController?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '添加包裹', + backgroundColor: Colors.white, + body: Center( + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 32.w), + child: Column( + children: [ + _inputRowTile('收件人姓名', _nameController), + _inputRowTile('联系方式', _phoneController, + formatters: [FilteringTextInputFormatter.digitsOnly]), + _inputRowTile('收件人楼层地址', _addressController), + _inputRowTile('包裹单号', _codeController, + formatters: [FilteringTextInputFormatter.digitsOnly]), + _inputRowTile('放置位置', _placeController), + ], + ), + ), + ), + bottom: _bottomButton(), + ); + } + + Widget _bottomButton() { + return Padding( + padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), + child: MaterialButton( + minWidth: double.infinity, + height: 86.w, + color: kPrimaryColor, + elevation: 0, + focusElevation: 0, + hoverElevation: 0, + highlightElevation: 0, + padding: EdgeInsets.symmetric(vertical: 24.w), + onPressed: () async { + canSubmit + ? await addPackage( + code: _codeController.text, + addresseeName: _nameController.text, + addresseeTel: _phoneController.text, + address: _addressController.text, + placePosition: _placeController.text) + : null; + }, + child: '确认提交'.text.size(32.sp).color(kTextPrimaryColor).bold.make(), + ), + ); + } + + Future addPackage( + {@required String code, + @required String addresseeName, + @required String addresseeTel, + @required String address, + @required String placePosition}) async { + BaseModel baseModel = await NetUtil().post( + API.manage.addPackage, + params: { + "code": code, + "addresseeName": addresseeName, + "addresseeTel": addresseeTel, + "address": address, + "placePosition": placePosition, + }, + ); + + if (!baseModel.status) { + BotToast.showText(text: baseModel.message); + return; + } + BotToast.showText(text: baseModel.message); + Get.back(); + } + + Widget _inputRowTile(String title, TextEditingController controller, + {String hintText, List formatters}) { + return Container( + width: double.infinity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + 40.w.heightBox, + title.text.size(28.sp).color(kTextPrimaryColor).make(), + 32.w.heightBox, + TextField( + inputFormatters: formatters, + textAlign: TextAlign.start, + onChanged: (value) { + controller.text = value; + setState(() {}); + }, + decoration: InputDecoration( + hintText: hintText ?? '', + isDense: true, + contentPadding: EdgeInsets.zero, + enabledBorder: UnderlineInputBorder( + borderSide: BorderSide(color: Color(0xFFE8E8E8), width: 2.w), + ), + ), + style: TextStyle( + fontSize: 36.sp, + fontWeight: FontWeight.bold, + color: kTextPrimaryColor, + ), + ), + ], + ), + ); + } +} diff --git a/lib/ui/manage_pages/packages_manage/packages_manage_card.dart b/lib/ui/manage_pages/packages_manage/packages_manage_card.dart index 526df9a..83b663d 100644 --- a/lib/ui/manage_pages/packages_manage/packages_manage_card.dart +++ b/lib/ui/manage_pages/packages_manage/packages_manage_card.dart @@ -40,8 +40,7 @@ class _PackageManageCardState extends State { children: [ Row( children: [ - '3号柜${Random().nextInt(10)}号箱' - .text + widget.model.placePosition.text .size(32.sp) .color(kTextPrimaryColor) .bold @@ -82,7 +81,7 @@ class _PackageManageCardState extends State { _rowTile( R.ASSETS_MANAGE_IC_TIME_PNG, '送达时间', - DateUtil.formatDate(widget.model.receiveDate, + DateUtil.formatDate(widget.model.createDate, format: 'yyyy-MM-dd HH:mm') .text .size(24.sp) diff --git a/lib/ui/manage_pages/packages_manage/packages_manage_page.dart b/lib/ui/manage_pages/packages_manage/packages_manage_page.dart index 61c68f1..ba71e4e 100644 --- a/lib/ui/manage_pages/packages_manage/packages_manage_page.dart +++ b/lib/ui/manage_pages/packages_manage/packages_manage_page.dart @@ -1,10 +1,12 @@ - +import 'package:aku_community_manager/ui/manage_pages/packages_manage/add_package_page.dart'; import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community_manager/const/resource.dart'; class PackagesManagePage extends StatefulWidget { PackagesManagePage({Key key}) : super(key: key); @@ -27,13 +29,28 @@ class _PackagesManagePageState extends State Widget build(BuildContext context) { return AkuScaffold( title: '包裹管理', + actions: [ + IconButton( + icon: SizedBox( + width: 40.w, + height: 40.w, + child: Image.asset(R.ASSETS_MANAGE_ADD_PNG), + ), + onPressed: () { + Get.to(() => AddPackagePage()); + }) + ], appBarBottom: PreferredSize( child: AkuTabBar(controller: _tabController, tabs: _tabs), preferredSize: Size.fromHeight(88.w), ), body: TabBarView( controller: _tabController, - children: List.generate(_tabs.length, (index) => PackagesManageView(index: index,)), + children: List.generate( + _tabs.length, + (index) => PackagesManageView( + index: index, + )), ), ); }