5 Commits 3edf521fb9 ... 4499247657

Auteur SHA1 Message Date
  “HeShaoZe” 4499247657 Merge branch 'v1.1.0' into v1.1.0-iOS il y a 4 mois
  “HeShaoZe” cce78fffd6 Merge branch 'v1.1.0' into v1.1.0-iOS il y a 4 mois
  “HeShaoZe” 149bb9e59a fix:解决 付款成功后,一直显示【正在查询订单状态】弹窗的问题。 il y a 4 mois
  “HeShaoZe” 1a23bc9e31 fix:iOS 去掉专属客服入口 il y a 4 mois
  “HeShaoZe” c06dab13f4 fix:解决会员中心返回键失效的问题。 il y a 4 mois

+ 12 - 0
lib/module/member/member_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
+import 'dart:ui';
 
 import 'package:agile_pay/flutter_pay.dart';
 import 'package:flutter/material.dart';
@@ -319,6 +320,9 @@ class MemberController extends BaseController implements PaymentStatusCallback {
       });
     } else {
       _isPopBackInProgress = false;
+      if (Platform.isAndroid) {
+        back();
+      }
     }
   }
 
@@ -611,10 +615,18 @@ class MemberController extends BaseController implements PaymentStatusCallback {
   @override
   void onPaymentSuccess(
       String orderNo, PayItemBean paymentWay, GoodsBean storeItemBean) {
+    ///购买成功消失
+    LoadingDialog.hide();
     ///购买成功之后弹出
     afterTheFirstPurchasePromptSharingBoxPops();
   }
 
+  @override
+  void onPaymentFail() {
+    ///购买成功消失
+    LoadingDialog.hide();
+  }
+
   ///第一次购买之后弹出提示分享框
   void afterTheFirstPurchasePromptSharingBoxPops() {
     paymentStatusManager.onOrderFirstCheck().then((checkReponse) {

+ 6 - 2
lib/module/mine/mine_page.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -405,10 +407,12 @@ class MinePage extends BasePage<MineController> {
               () => controller.onUrgentContactClick()),
           buildMineFunItem(Assets.images.iconMineFunShare.provider(),
               StringName.mineFunShare, () => controller.onShareClick()),
-          buildMineFunItem(
+          Visibility(
+            visible: Platform.isAndroid,
+            child: buildMineFunItem(
               Assets.images.iconMineFunCustomerService.provider(),
               StringName.mineFunCustomerService,
-              () => controller.onCustomerServiceClick()),
+                  () => controller.onCustomerServiceClick()),),
           buildMineFunItem(
               Assets.images.iconMineFunPermissionSetting.provider(),
               StringName.mineFunPermissionSetting,

+ 4 - 0
lib/utils/payment_status_manager.dart

@@ -60,6 +60,8 @@ class PaymentStatusManager {
         reportPaySuccess(storeItemBean.amount, orderNo, storeItemBean.name,
             paymentWay.payMethod);
       }).catchError((error) async {
+        ///失败回调
+        callbackMap[orderNo]?.onPaymentFail();
         await _lock.synchronized(() {
           callbackMap.remove(orderNo);
         });
@@ -137,4 +139,6 @@ class PaymentStatusException implements Exception {
 abstract class PaymentStatusCallback {
   void onPaymentSuccess(
       String orderNo, PayItemBean paymentWay, GoodsBean storeItemBean);
+
+  void onPaymentFail();
 }