From 024a3b5ec2b2db39deb00a85718a6c6d686cd896 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 25 Nov 2021 15:37:29 +0800
Subject: [PATCH] fix(sdk): parseRedirectInfo

---
 packages/uni-app-plus/dist/uni-app-service.es.js       | 10 ++++++----
 .../src/service/framework/app/initEntry.ts             |  6 ++++--
 .../src/service/framework/app/initGlobalEvent.ts       |  2 +-
 .../uni-app-plus/src/service/framework/app/utils.ts    |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/uni-app-plus/dist/uni-app-service.es.js b/packages/uni-app-plus/dist/uni-app-service.es.js
index ec490ad17..d43415a1c 100644
--- a/packages/uni-app-plus/dist/uni-app-service.es.js
+++ b/packages/uni-app-plus/dist/uni-app-service.es.js
@@ -2702,7 +2702,7 @@ var serviceContext = (function (vue) {
               referrerInfo.extraData = extraData;
           }
           return {
-              path,
+              path: path || '',
               query: query ? '?' + query : '',
               referrerInfo,
               userAction,
@@ -17096,8 +17096,10 @@ var serviceContext = (function (vue) {
       const weexPlus = weex.requireModule('plus');
       if (weexPlus.getRedirectInfo) {
           const { path, query, referrerInfo } = parseRedirectInfo();
-          entryPagePath = path;
-          entryPageQuery = query;
+          if (path) {
+              entryPagePath = path;
+              entryPageQuery = query;
+          }
           __uniConfig.referrerInfo = referrerInfo;
       }
       else {
@@ -18546,7 +18548,7 @@ var serviceContext = (function (vue) {
       });
       plusGlobalEvent.addEventListener('resume', () => {
           const info = parseRedirectInfo();
-          if (info && info.userAction) {
+          if (info && info.userAction && info.path) {
               initEnterOptions(info);
               initEnterReLaunch(info);
           }
diff --git a/packages/uni-app-plus/src/service/framework/app/initEntry.ts b/packages/uni-app-plus/src/service/framework/app/initEntry.ts
index d16ee865d..1fff994fe 100644
--- a/packages/uni-app-plus/src/service/framework/app/initEntry.ts
+++ b/packages/uni-app-plus/src/service/framework/app/initEntry.ts
@@ -17,8 +17,10 @@ export function initEntry() {
 
   if (weexPlus.getRedirectInfo) {
     const { path, query, referrerInfo } = parseRedirectInfo()!
-    entryPagePath = path
-    entryPageQuery = query
+    if (path) {
+      entryPagePath = path
+      entryPageQuery = query
+    }
     __uniConfig.referrerInfo = referrerInfo
   } else {
     const argsJsonStr = plus.runtime.arguments
diff --git a/packages/uni-app-plus/src/service/framework/app/initGlobalEvent.ts b/packages/uni-app-plus/src/service/framework/app/initGlobalEvent.ts
index 129866741..c11308a93 100644
--- a/packages/uni-app-plus/src/service/framework/app/initGlobalEvent.ts
+++ b/packages/uni-app-plus/src/service/framework/app/initGlobalEvent.ts
@@ -35,7 +35,7 @@ export function initGlobalEvent() {
 
   plusGlobalEvent.addEventListener('resume', () => {
     const info = parseRedirectInfo()
-    if (info && info.userAction) {
+    if (info && info.userAction && info.path) {
       initEnterOptions(info)
       initEnterReLaunch(info)
     }
diff --git a/packages/uni-app-plus/src/service/framework/app/utils.ts b/packages/uni-app-plus/src/service/framework/app/utils.ts
index 7c8ec0255..92af7ef31 100644
--- a/packages/uni-app-plus/src/service/framework/app/utils.ts
+++ b/packages/uni-app-plus/src/service/framework/app/utils.ts
@@ -66,7 +66,7 @@ export function parseRedirectInfo(): RedirectInfo | void {
       referrerInfo.extraData = extraData
     }
     return {
-      path,
+      path: path || '',
       query: query ? '?' + query : '',
       referrerInfo,
       userAction,
-- 
GitLab