From fcd230984d0721f100856f5f15efe8f18fe96111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyanghuaxuan=E2=80=9D?= <“646903573@qq.com”>
Date: Sat, 24 Apr 2021 16:23:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=B7=98=E5=AE=9D=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/android/app/build.gradle                   |  2 +-
 example/pubspec.yaml                               |  2 +-
 .../intellect_search_goods_dialog.dart             | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 439c319..9769b65 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -54,7 +54,7 @@ android {
         ndk {
             //选择要添加的对应cpu类型的.so库。
             abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a'
-            //abiFilters  'armeabi-v7a','x86_64'
+           // abiFilters  'armeabi-v7a','x86_64'
         }
     }
 
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index f8b772a..c10e063 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -36,7 +36,7 @@ dev_dependencies:
     path: ../../zhiying_acquisition
   zhiying_shopping_mall:
     git:
-      ref: 0.0.5
+      ref: 0.0.6
       url: 'http://192.168.0.138:3000/FnuoOS_ZhiYing/zhiying_shopping_mall.git'
   zhiying_credit_card:
     path: ../../zhiying_credit_card
diff --git a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
index bd0632f..98fed66 100644
--- a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
+++ b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
@@ -375,17 +375,23 @@ class _IntellectSearchGoodsDialogState
       widget?.model?.couponUrl=widget?.model?.couponUrl.replaceAll("\\", "");
       print("链接" + widget?.model?.couponUrl ?? "");
       Logger.log('智能弹窗有商品情况跳转数据 = ${widget?.model?.toJson()}');
-      ///关闭弹窗
-      if (Navigator.canPop(context)) {
-        Navigator.pop(context);
-      }
+
 
       String tempProvider = widget?.model?.provider ?? 'taobao';
 
       /// 判断淘宝渠道是否授权
       if(tempProvider == GlobalConfig.PROVIDER_TB  || tempProvider == GlobalConfig.PROVIDER_TM ) {
         bool isAuth = await TaobaoAuth.auth(context);
+        ///关闭弹窗
+        if (Navigator.canPop(context)) {
+          Navigator.pop(context);
+        }
         if (!isAuth) return;
+      }else{
+        ///关闭弹窗
+        if (Navigator.canPop(context)) {
+          Navigator.pop(context);
+        }
       }
 
       /// 改成统一跳转