From 0f26e322a359c2f7740d1b7c7b01e5f87c07e6cc Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 30 May 2022 11:40:14 +0800
Subject: [PATCH] fix(h5): render function of App.vue (question/146011)

---
 packages/uni-h5/src/framework/setup/index.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/uni-h5/src/framework/setup/index.ts b/packages/uni-h5/src/framework/setup/index.ts
index 711e76794..cc64f57b5 100644
--- a/packages/uni-h5/src/framework/setup/index.ts
+++ b/packages/uni-h5/src/framework/setup/index.ts
@@ -1,4 +1,4 @@
-import { extend, invokeArrayFns, isPlainObject } from '@vue/shared'
+import { extend, invokeArrayFns, isPlainObject, isFunction } from '@vue/shared'
 import {
   ComponentInternalInstance,
   ComponentPublicInstance,
@@ -187,12 +187,14 @@ export function setupApp(comp: any) {
     before(comp) {
       comp.mpType = 'app'
       const { setup } = comp
-      comp.setup = (props, ctx) => {
-        return setup && setup(props, ctx)
-      }
-      comp.render = () => {
+      const render = () => {
         return openBlock(), createBlock(LayoutComponent)
       }
+      comp.setup = (props, ctx) => {
+        const res = setup && setup(props, ctx)
+        return isFunction(res) ? render : res
+      }
+      comp.render = render
     },
   })
 }
-- 
GitLab