From b78148e2e8b8ac61ebad98c28c4dad4952d0dcd0 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 24 Apr 2020 17:11:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=84=E4=BB=B6=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/runtime/wrapper/util.js                | 5 +++--
 src/platforms/mp-alipay/runtime/wrapper/util.js | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js
index 9decf38961..79db9f9805 100644
--- a/src/core/runtime/wrapper/util.js
+++ b/src/core/runtime/wrapper/util.js
@@ -287,11 +287,12 @@ function wrapper (event) {
 
   event.target = event.target || {}
 
-  if (!hasOwn(event, 'detail') || !event.detail) {
+  if (!hasOwn(event, 'detail')) {
     event.detail = {}
   }
 
-  if (hasOwn(event, 'markerId') && !hasOwn(event.detail, 'markerId')) {
+  if (hasOwn(event, 'markerId')) {
+    event.detail = typeof event.detail === 'object' ? event.detail : {}
     event.detail.markerId = event.markerId
   }
 
diff --git a/src/platforms/mp-alipay/runtime/wrapper/util.js b/src/platforms/mp-alipay/runtime/wrapper/util.js
index ecf5b0f0db..7b35f4b03d 100644
--- a/src/platforms/mp-alipay/runtime/wrapper/util.js
+++ b/src/platforms/mp-alipay/runtime/wrapper/util.js
@@ -59,10 +59,8 @@ export function initSpecialMethods (mpInstance) {
     specialMethods.forEach(method => {
       if (isFn(mpInstance.$vm[method])) {
         mpInstance[method] = function (event) {
-          if (!hasOwn(event, 'detail') || !event.detail) {
-            event.detail = {}
-          }
-          if (hasOwn(event, 'markerId') && !hasOwn(event.detail, 'markerId')) {
+          if (hasOwn(event, 'markerId')) {
+            event.detail = typeof event.detail === 'object' ? event.detail : {}
             event.detail.markerId = event.markerId
           }
           // TODO normalizeEvent
-- 
GitLab