From 7f6291e80073c0c29f9d24bfdd3ac2602a059e70 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 18 五月 2021 10:10:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/layer/src/layer.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/components/layer/src/layer.js b/src/components/layer/src/layer.js
index b0581c1..2bf291b 100644
--- a/src/components/layer/src/layer.js
+++ b/src/components/layer/src/layer.js
@@ -23,10 +23,12 @@
     console.log(opt)
     self.closeAll()
     var options = mergeJson(opt, defOptions)
+    console.log('11111' + options)
     const id = `notification_${new Date().getTime()}_${seed++}`
     options.id = id
     options.layer = self
-    options.content.content = Vue.extend(options.content.content)
+    options.content.comp = Vue.extend(options.content.comp)
+    console.log(options)
     const instance = new LayerVueExtend({
       data: options
     })

--
Gitblit v1.8.0