|
|
@@ -134,8 +134,6 @@ class MemberController extends BaseController implements PaymentStatusCallback {
|
|
|
"用来遛狗也很方便,再也不用担心狗狗跑丢了,真是个好工具!"),
|
|
|
];*/
|
|
|
|
|
|
- static const String _keMemberPageShowKey = "member_page_show_key";
|
|
|
-
|
|
|
MemberController(
|
|
|
this.accountRepository, this.memberRepository, this.paymentStatusManager);
|
|
|
|
|
|
@@ -300,40 +298,13 @@ class MemberController extends BaseController implements PaymentStatusCallback {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- void _showFreeMemberDialog() {
|
|
|
- KVUtil.putBool(_keMemberPageShowKey, false);
|
|
|
- MemberUserCancelPayDialog.show(payClick: () {
|
|
|
- //获取会员
|
|
|
- MineController attributionController = Get.find<MineController>();
|
|
|
- attributionController.onMemberTryOutClick().then((_) {
|
|
|
- MemberUserCancelPayDialog.dismiss();
|
|
|
- });
|
|
|
- }, cancelClick: () {
|
|
|
- if (Platform.isAndroid) back();
|
|
|
- });
|
|
|
- }
|
|
|
|
|
|
///用户取消支付展示
|
|
|
void userCancelsPaymentDisplay() {
|
|
|
- final isShowRetainDialog =
|
|
|
- accountRepository.memberStatusInfo.value?.trialed != true &&
|
|
|
- KVUtil.getBool(_keMemberPageShowKey, true);
|
|
|
if (_isShowPayFailedDialog) {
|
|
|
- if (isShowRetainDialog &&
|
|
|
- accountRepository.isLogin.value == true &&
|
|
|
- ConfigRepository.getInstance().isOpenFreeMember.value == true) {
|
|
|
- _showFreeMemberDialog();
|
|
|
- } else if (Platform.isAndroid) {
|
|
|
- back();
|
|
|
- }
|
|
|
+ if (Platform.isAndroid) back();
|
|
|
} else {
|
|
|
- if (isShowRetainDialog &&
|
|
|
- accountRepository.isLogin.value == true &&
|
|
|
- ConfigRepository.getInstance().isOpenFreeMember.value == true) {
|
|
|
- _showFreeMemberDialog();
|
|
|
- } else {
|
|
|
- showRetainDialog(isBack: true);
|
|
|
- }
|
|
|
+ showRetainDialog(isBack: true);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -420,10 +391,12 @@ class MemberController extends BaseController implements PaymentStatusCallback {
|
|
|
}
|
|
|
|
|
|
///发起购买请求
|
|
|
- Future<void> _onApplePay(String outTradeNo,
|
|
|
- String appAccountToken,
|
|
|
- PayItemBean payWayInfo,
|
|
|
- GoodsBean goodsInfo,) async {
|
|
|
+ Future<void> _onApplePay(
|
|
|
+ String outTradeNo,
|
|
|
+ String appAccountToken,
|
|
|
+ PayItemBean payWayInfo,
|
|
|
+ GoodsBean goodsInfo,
|
|
|
+ ) async {
|
|
|
final result = await ApplePay().purchase(
|
|
|
productId: goodsInfo.appleGoodsId ?? "",
|
|
|
appAccountToken: appAccountToken,
|