From f6c05b70e6f74b413d8bce3d63f844c6cdb194f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 21:20:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 seller/src/views/lili-components/editor/index.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/seller/src/views/lili-components/editor/index.vue b/seller/src/views/lili-components/editor/index.vue
index a28d64e..5bd05ee 100644
--- a/seller/src/views/lili-components/editor/index.vue
+++ b/seller/src/views/lili-components/editor/index.vue
@@ -3,7 +3,7 @@
     <!-- 浣跨敤 fullscreen 绫绘潵鎺у埗鏄惁鍏ㄥ睆鏄剧ず -->
     <div :class="{ fullscreen: fullscreen }" class="tinymce-container">
       <!-- 浣跨敤 tinymce-textarea 绫讳綔涓虹紪杈戝櫒鐨勬枃鏈尯鍩� -->
-      <uploadImage @callback="insertImage" />
+      <uploadImage @callback="insertImage"  v-if="showUpload"/>
       <textarea :id="tinymceId" class="tinymce-textarea" />
     </div>
   </div>
@@ -23,6 +23,9 @@
     height:{
       type:String,
       default:'500px'
+    },showUpload:{
+      type:Boolean,
+      default:true
     }
   },
   data() {

--
Gitblit v1.8.0