From de31b1592e75f8e7c47316801f1f19068a49199b Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 19 Mar 2021 14:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BD=BF=E7=94=A8=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=8D=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeCard/model/user_card_ model.dart | 3 ++ .../upgradeCard/upgrade_card_unused_view.dart | 44 ++++++++++++++++--- .../upgradeCard/upgrade_card_used_view.dart | 2 +- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/lib/pages/upgradeCard/model/user_card_ model.dart b/lib/pages/upgradeCard/model/user_card_ model.dart index 263b9c6..44adccc 100644 --- a/lib/pages/upgradeCard/model/user_card_ model.dart +++ b/lib/pages/upgradeCard/model/user_card_ model.dart @@ -3,6 +3,7 @@ class UserCardModel { String code; int type; int source; + String sourceName; int status; int giveUserId; String giveUserNickname; @@ -14,6 +15,7 @@ class UserCardModel { this.code, this.type, this.source, + this.sourceName, this.status, this.giveUserId, this.giveUserNickname, @@ -25,6 +27,7 @@ class UserCardModel { code = json['code']; type = json['type']; source = json['source']; + sourceName = json['scourceName']; status = json['status']; giveUserId = json['giveUserId']; giveUserNickname = json['giveUserNickname']; diff --git a/lib/pages/upgradeCard/upgrade_card_unused_view.dart b/lib/pages/upgradeCard/upgrade_card_unused_view.dart index 64b0063..2c54117 100644 --- a/lib/pages/upgradeCard/upgrade_card_unused_view.dart +++ b/lib/pages/upgradeCard/upgrade_card_unused_view.dart @@ -1,7 +1,11 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:oktoast/oktoast.dart'; +import 'package:recook/constants/api_v2.dart'; +import 'package:recook/manager/http_manager.dart'; import 'package:recook/pages/upgradeCard/function/user_card_function.dart'; import 'package:recook/pages/upgradeCard/model/user_card_%20model.dart'; +import 'package:recook/pages/upgradeCard/upgrade_card_use_result_page.dart'; import 'package:recook/widgets/alert.dart'; import 'package:recook/widgets/refresh_widget.dart'; import 'package:velocity_x/velocity_x.dart'; @@ -36,18 +40,22 @@ class _UpgradeUnusedViewState extends State { _page = 1; _cards = await UserCardFunction.fetchList(_page, 0); _refreshController.refreshCompleted(); + setState(() {}); }, onLoadMore: () async { _page++; _cards.addAll(await UserCardFunction.fetchList(_page, 0)); - _refreshController.refreshCompleted(); + _refreshController.loadComplete(); setState(() {}); }, body: ListView.separated( separatorBuilder: (_, __) => 10.hb, itemBuilder: (context, index) { final item = _cards[index]; - return _UserCard(model: item); + return _UserCard( + model: item, + refreshController: _refreshController, + ); }, itemCount: _cards.length, padding: EdgeInsets.symmetric( @@ -61,7 +69,9 @@ class _UpgradeUnusedViewState extends State { class _UserCard extends StatelessWidget { final UserCardModel model; - const _UserCard({Key key, this.model}) : super(key: key); + final GSRefreshController refreshController; + const _UserCard({Key key, this.model, this.refreshController}) + : super(key: key); Future _openUseCardDialog({String confirmTitle, Widget child}) async { return (await Get.dialog(NormalContentDialog( @@ -143,7 +153,11 @@ class _UserCard extends StatelessWidget { .size(16.sp) .bold .make(), - '系统赠送'.text.color(Color(0xFFDD2C4E)).size(12.sp).make(), + (model?.sourceName ?? '') + .text + .color(Color(0xFFDD2C4E)) + .size(12.sp) + .make(), ], ).expand(), Column( @@ -175,11 +189,29 @@ class _UserCard extends StatelessWidget { ), ); if (result) { - + ResultData resultData = await HttpManager.post( + APIV2.userAPI.useCard, + {'cardId': model.id}, + ); + if (resultData.data['code'] == 'FAIL') { + showToast(resultData.data['msg']); + await Get.to(UpgradeUseResultPage( + result: false, + content: '使用失败,您已经使用了一张权益卡', + )); + } else + await Get.to(UpgradeUseResultPage( + result: true, + content: '恭喜您,使用成功!', + )); + refreshController.requestRefresh(); } }), 16.hb, - _renderButton(title: '赠送', onTap: () {}), + _renderButton( + title: '赠送', + onTap: () async {}, + ), ], ), ], diff --git a/lib/pages/upgradeCard/upgrade_card_used_view.dart b/lib/pages/upgradeCard/upgrade_card_used_view.dart index 8c46c1a..6440f85 100644 --- a/lib/pages/upgradeCard/upgrade_card_used_view.dart +++ b/lib/pages/upgradeCard/upgrade_card_used_view.dart @@ -41,7 +41,7 @@ class _UpgradeUsedViewState extends State { onLoadMore: () async { _page++; _cards.addAll(await UserCardFunction.fetchList(_page, 1)); - _refreshController.refreshCompleted(); + _refreshController.loadComplete(); setState(() {}); }, body: ListView.separated(