master
章文轩 4 years ago
parent 549f8fa809
commit 3f62f6550b

@ -32,12 +32,13 @@ class UserBenefitFunc {
return UserIncomeModel.fromJson(result.data['data']); return UserIncomeModel.fromJson(result.data['data']);
} }
} }
}
// //
static Future<UserIncomeModel> notReceicedIncome( static Future<UserIncomeModel> notReceicedIncome(String date_str, int type) async {
String date_str, int type) async {
ResultData result = await HttpManager.post( ResultData result = await HttpManager.post(
APIV2.userAPI.notReceivedDetail, {'date_str': date_str, 'type': type}); APIV2.userAPI.notReceivedDetail,
{'date_str': date_str, 'type': type});
if (result.data != null) { if (result.data != null) {
if (result.data['data'] != null) { if (result.data['data'] != null) {
@ -113,8 +114,7 @@ class UserBenefitFunc {
return UserBenefitSubModel.fromJson(result.data, type); return UserBenefitSubModel.fromJson(result.data, type);
} }
static Future<List<UserBenefitMonthDetailModel>> monthDetail( static Future<List<UserBenefitMonthDetailModel>> monthDetail(DateTime date) async {
DateTime date) async {
ResultData result = await HttpManager.post( ResultData result = await HttpManager.post(
APIV2.userAPI.monthDetail, APIV2.userAPI.monthDetail,
{'month': DateUtil.formatDate(date, format: 'yyyy-MM')}, {'month': DateUtil.formatDate(date, format: 'yyyy-MM')},
@ -179,8 +179,7 @@ class UserBenefitFunc {
return UserBenefitCommonModel.fromJson(result.data['data']); return UserBenefitCommonModel.fromJson(result.data['data']);
} }
static Future<UserBenefitDayExpectModel> getBenefitDayExpect( static Future<UserBenefitDayExpectModel> getBenefitDayExpect(DateTime date) async {
DateTime date) async {
String path = ''; String path = '';
Map<String, dynamic> params = {}; Map<String, dynamic> params = {};
path = APIV2.benefitAPI.dayExpect; path = APIV2.benefitAPI.dayExpect;
@ -231,3 +230,4 @@ class UserBenefitFunc {
return UserBenefitExpectExtraModel.fromJson(result.data['data']); return UserBenefitExpectExtraModel.fromJson(result.data['data']);
} }
} }

@ -312,60 +312,55 @@ class _UserBenefitShopPageState extends State<UserBenefitShopPage> {
//}, //},
body: ListView( body: ListView(
children: [ children: [
Stack( Stack(children: [
children: [
Positioned( Positioned(
left: 0, left: 0,
right: 0, right: 0,
top: 0, top: 0,
child: CustomPaint(painter: RoundBackgroundPainter()), child: CustomPaint(painter: RoundBackgroundPainter()),
), ),
_buildCard(), ]),
], 10.hb,
),
Row( Row(
children: [ children: [
10.wb, 10.wb,
MaterialButton( // MaterialButton(
shape: StadiumBorder(), // shape: StadiumBorder(),
elevation: 0, // elevation: 0,
color: Colors.white, // color: Colors.white,
onPressed: () { // onPressed: () {
showTimePickerBottomSheet( // showTimePickerBottomSheet(
submit: (time, type) { // submit: (time, type) {
Navigator.maybePop(context); // Navigator.maybePop(context);
_date = time; // _date = time;
_refreshController.requestRefresh(); // _refreshController.requestRefresh();
setState(() {}); // setState(() {});
}, // },
timePickerTypes: [ // timePickerTypes: [
BottomTimePickerType.BottomTimePickerMonth // BottomTimePickerType.BottomTimePickerMonth
]); // ]);
}, // },
height: 31.rw, // height: 31.rw,
child: Row( // child: Row(
children: [ // children: [
DateUtil.formatDate(_date, format: 'yyyy-MM') // DateUtil.formatDate(_date, format: 'yyyy-MM')
.text // .text
.black // .black
.size(14.rsp) // .size(14.rsp)
.make(), // .make(),
Icon( // Icon(
Icons.arrow_drop_down, // Icons.arrow_drop_down,
color: Colors.black87, // color: Colors.black87,
), // ),
// ],
// ),
// materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
// ),
], ],
), ),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, _buildCard(),
),
Spacer(),
15.wb,
], ],
),
],
),
//_buildGroupItems(), //_buildGroupItems(),
), ),
), ),

Loading…
Cancel
Save