合并代码

jiuyi2/components/public/editor/editor.vue

@@ -16,6 +16,8 @@
 	const {
 		proxy
 	} = getCurrentInstance()
+
+	const emits = defineEmits(['update:modelValue']);
 	// 编辑器内容
 	const formats = reactive({})
 	// 编辑器上下文对象
@@ -57,7 +59,6 @@
 	 * @param {Object} event
 	 */
 	function handleEditor(event) {
-		console.log('format', event.target.dataset)
 		let {
 			name,
 			value
@@ -220,8 +221,9 @@
 
 		<!-- 内容 -->
 		<view class="main">
-			<editor id="editor" class="ql-container" placeholder="在此输入产品详情" showImgSize showImgToolbar showImgResize
+			<editor id="editor" class="ql-container" placeholder="在此输入产品详情" showImgSize
-				@statuschange="onStatusChange" @ready="onEditorReady">
+				showImgToolbar showImgResize @statuschange="onStatusChange" @ready="onEditorReady"
+				@input="$emit('update:modelValue', $event.target.value)">
 			</editor>
 		</view>
 	</view>

jiuyi2/pages/release/commodity.vue

@@ -327,7 +327,7 @@
 			</view>
 
 			<view class="main area editor">
-				<editorArea />
+				<!-- <editorArea v-model="form.infoRichText" /> -->
 			</view>
 		</view>