diff --git a/lib/model/manager/article_borrow_model.dart b/lib/model/manager/article_borrow_model.dart new file mode 100644 index 00000000..3aaf202f --- /dev/null +++ b/lib/model/manager/article_borrow_model.dart @@ -0,0 +1,33 @@ +import 'package:akuCommunity/model/common/img_model.dart'; + +class ArticleBorrowModel { + int id; + String name; + int quantity; + List imgUrls; + + ArticleBorrowModel({this.id, this.name, this.quantity, this.imgUrls}); + + ArticleBorrowModel.fromJson(Map json) { + id = json['id']; + name = json['name']; + quantity = json['quantity']; + if (json['imgUrls'] != null) { + imgUrls = new List(); + json['imgUrls'].forEach((v) { + imgUrls.add(new ImgModel.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['name'] = this.name; + data['quantity'] = this.quantity; + if (this.imgUrls != null) { + data['imgUrls'] = this.imgUrls.map((v) => v.toJson()).toList(); + } + return data; + } +} diff --git a/lib/model/manager/mine_goods_model.dart b/lib/model/manager/mine_goods_model.dart new file mode 100644 index 00000000..6f77f281 --- /dev/null +++ b/lib/model/manager/mine_goods_model.dart @@ -0,0 +1,40 @@ +class MineGoodsModel { + int id; + String name; + int code; + String beginDate; + String endDate; + int borrowDate; + int borrowStatus; + + MineGoodsModel( + {this.id, + this.name, + this.code, + this.beginDate, + this.endDate, + this.borrowDate, + this.borrowStatus}); + + MineGoodsModel.fromJson(Map json) { + id = json['id']; + name = json['name']; + code = json['code']; + beginDate = json['beginDate']; + endDate = json['endDate']; + borrowDate = json['borrowDate']; + borrowStatus = json['borrowStatus']; + } + + Map toJson() { + final Map data = new Map(); + data['id'] = this.id; + data['name'] = this.name; + data['code'] = this.code; + data['beginDate'] = this.beginDate; + data['endDate'] = this.endDate; + data['borrowDate'] = this.borrowDate; + data['borrowStatus'] = this.borrowStatus; + return data; + } +} diff --git a/lib/pages/goods_manage_page/goods_manage_page.dart b/lib/pages/goods_manage_page/goods_manage_page.dart index 12f69d72..f42b194f 100644 --- a/lib/pages/goods_manage_page/goods_manage_page.dart +++ b/lib/pages/goods_manage_page/goods_manage_page.dart @@ -97,26 +97,6 @@ class _GoodsManagePageState extends State { alignment: Alignment.center, child: '我的借还物品'.text.black.size(28.sp).make())) ], - // body: Stack( - // children: [ - // Column( - // children: _listGoods - // .map((item) => _goodsCard( - // item['imagePath'], - // item['title'], - // item['goodsNum'], - // )) - // .toList(), - // ), - // Positioned( - // bottom: 0, - // child: BottomButton( - // title: '扫一扫出借', - // fun: () {}, - // ), - // ), - // ], - // ), body: BeeListView( path: API.manager.articleBorrow, diff --git a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart b/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart index 5e84ef71..6fd9cb5b 100644 --- a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart +++ b/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart @@ -194,9 +194,12 @@ class _MineGoodsPageState extends State { .toList(); }, builder: (items) { - return ListView.builder(itemBuilder: (context, index) { - return _goodsCard(items[index]); - }); + return ListView.builder( + itemBuilder: (context, index) { + return _goodsCard(items[index]); + }, + itemCount: items.length, + ); }), ); }