From f2c85d4e72ad134d0609daf36d7d186e88cc926a Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Fri, 15 Nov 2019 14:15:32 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"update:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AB=AF=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=9C=A8=E6=A8=A1=E7=89=88=E5=86=85=E4=BD=BF=E7=94=A8$emit?=
 =?UTF-8?q?=E7=9A=84Bug=20askID:82865"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e3674be5bd96ac19bd38f9e42e0f73a81a624b57.
---
 .../packages/mp-vue/dist/mp.runtime.esm.js            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js b/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
index 0b2184f28..eb536888a 100644
--- a/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
+++ b/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
@@ -5765,13 +5765,12 @@ function internalMixin(Vue) {
   var oldEmit = Vue.prototype.$emit;
 
   Vue.prototype.$emit = function(event) {
-    if (this.$scope && event) {
-      this.$scope['triggerEvent'](event, {
-        __args__: toArray(arguments, 1)
-      });
-    } else {
-      return oldEmit.apply(this, arguments)
+    if (this.$scope && event) {
+      this.$scope['triggerEvent'](event, {
+        __args__: toArray(arguments, 1)
+      });
     }
+    return oldEmit.apply(this, arguments)
   };
 
   Vue.prototype.$nextTick = function(fn) {
-- 
GitLab