diff --git a/package.json b/package.json
index 8fd1a0eb6449e5c801032a92d6aa4431770e5888..2e39bb16e44587f9dcacdc1cf7cfc23d56c51f6c 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "@form-create/element-ui": "^3.1.17",
     "@iconify/iconify": "^3.1.0",
     "@videojs-player/vue": "^1.0.0",
+    "@vueup/vue-quill": "^1.1.1",
     "@vueuse/core": "^9.13.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
diff --git a/src/views/mp/components/wx-editor/WxEditor.vue b/src/views/mp/components/wx-editor/WxEditor.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e5082d9c2343c47914cb9eddc437105a73b376b3
--- /dev/null
+++ b/src/views/mp/components/wx-editor/WxEditor.vue
@@ -0,0 +1,229 @@
+<script setup>
+import { ref, reactive } from 'vue'
+import { QuillEditor } from '@vueup/vue-quill'
+import '@vueup/vue-quill/dist/vue-quill.snow.css'
+import { getAccessToken } from '@/utils/auth'
+import { toolbarOptions } from './options'
+
+const BASE_URL = import.meta.env.VITE_BASE_URL
+
+const message = useMessage()
+
+const props = defineProps({
+  /* 公众号账号编号 */
+  accountId: {
+    type: Number,
+    required: true
+  },
+  /* 编辑器的内容 */
+  value: {
+    type: String,
+    default: ''
+  },
+  /* 图片大小 */
+  maxSize: {
+    type: Number,
+    default: 4000 // kb
+  }
+})
+
+const emit = defineEmits(['input'])
+
+const myQuillEditor = ref()
+// const editorType = ref('1')
+
+const content = ref(props.value.replace(/data-src/g, 'src'))
+
+const quillUpdateImg = ref(false) // 根据图片上传状态来确定是否显示loading动画，刚开始是false,不显示
+const editorOption = reactive({
+  theme: 'snow', // or 'bubble'
+  placeholder: '请输入文章内容',
+  modules: {
+    toolbar: {
+      container: toolbarOptions,
+      // container: "#toolbar",
+      handlers: {
+        image: function (value) {
+          if (value) {
+            // 触发input框选择图片文件
+            document.querySelector('.avatar-uploader input').click()
+          } else {
+            this.quill.format('image', false)
+          }
+        },
+        link: function (value) {
+          if (value) {
+            const href = prompt('注意！只支持公众号图文链接')
+            this.quill.format('link', href)
+          } else {
+            this.quill.format('link', false)
+          }
+        }
+      }
+    }
+  }
+})
+const actionUrl = ref(BASE_URL + '/admin-api/mp/material/upload-news-image') // 这里写你要上传的图片服务器地址
+const headers = ref({ Authorization: 'Bearer ' + getAccessToken() }) // 设置上传的请求头部
+const uploadData = reactive({
+  type: 'image', // TODO 芋艿：试试要不要换成 thumb
+  accountId: props.accountId
+})
+
+const onEditorChange = () => {
+  //内容改变事件
+  emit('input', content.value)
+}
+
+// 富文本图片上传前
+const beforeUpload = () => {
+  // 显示 loading 动画
+  quillUpdateImg.value = true
+}
+
+// 图片上传成功
+// 注意！由于微信公众号的图片有访问限制，所以会显示“此图片来自微信公众号，未经允许不可引用”
+const uploadSuccess = (res) => {
+  // res为图片服务器返回的数据
+  // 获取富文本组件实例
+  const quill = myQuillEditor.value.quill
+  // 如果上传成功
+  const link = res.data
+  if (link) {
+    // 获取光标所在位置
+    let length = quill.getSelection().index
+    // 插入图片  res.info为服务器返回的图片地址
+    quill.insertEmbed(length, 'image', link)
+    // 调整光标到最后
+    quill.setSelection(length + 1)
+  } else {
+    message.error('图片插入失败')
+  }
+  // loading 动画消失
+  quillUpdateImg.value = false
+}
+
+// 富文本图片上传失败
+const uploadError = () => {
+  // loading 动画消失
+  quillUpdateImg.value = false
+  message.error('图片插入失败')
+}
+</script>
+
+<template>
+  <div id="wxEditor">
+    <div v-loading="quillUpdateImg" element-loading-text="请稍等，图片上传中">
+      <!-- 图片上传组件辅助-->
+      <el-upload
+        class="avatar-uploader"
+        name="file"
+        :action="actionUrl"
+        :headers="headers"
+        :show-file-list="false"
+        :data="uploadData"
+        :on-success="uploadSuccess"
+        :on-error="uploadError"
+        :before-upload="beforeUpload"
+      />
+      <QuillEditor
+        class="editor"
+        v-model="content"
+        ref="myQuillEditor"
+        :options="editorOption"
+        @change="onEditorChange($event)"
+      />
+    </div>
+  </div>
+</template>
+
+<style>
+.editor {
+  line-height: normal !important;
+  height: 500px;
+}
+
+.ql-snow .ql-tooltip[data-mode='link']::before {
+  content: '请输入链接地址:';
+}
+
+.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
+  border-right: 0;
+  content: '保存';
+  padding-right: 0;
+}
+
+.ql-snow .ql-tooltip[data-mode='video']::before {
+  content: '请输入视频地址:';
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+  content: '14px';
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
+  content: '10px';
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
+  content: '18px';
+}
+
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
+  content: '32px';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item::before {
+  content: '文本';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
+  content: '标题1';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
+  content: '标题2';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
+  content: '标题3';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
+  content: '标题4';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
+  content: '标题5';
+}
+
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
+  content: '标题6';
+}
+
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+  content: '标准字体';
+}
+
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
+  content: '衬线字体';
+}
+
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
+  content: '等宽字体';
+}
+</style>
diff --git a/src/views/mp/components/wx-editor/options.js b/src/views/mp/components/wx-editor/options.js
new file mode 100644
index 0000000000000000000000000000000000000000..c44888855e3b9ded1847ea17df08b86785e64160
--- /dev/null
+++ b/src/views/mp/components/wx-editor/options.js
@@ -0,0 +1,16 @@
+export const toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+  ['blockquote', 'code-block'], // 引用  代码块
+  [{ header: 1 }, { header: 2 }], // 1、2 级标题
+  [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+  [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+  [{ indent: '-1' }, { indent: '+1' }], // 缩进
+  // [{'direction': 'rtl'}],                         // 文本方向
+  [{ size: ['small', false, 'large', 'huge'] }], // 字体大小
+  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+  [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+  [{ font: [] }], // 字体种类
+  [{ align: [] }], // 对齐方式
+  ['clean'], // 清除文本格式
+  ['link', 'image', 'video'] // 链接、图片、视频
+]
diff --git a/src/views/mp/draft/index.vue b/src/views/mp/draft/index.vue
index 497f72ec1bed5c413a670537b1f68a1e386fd31c..c025e27a473254a45945570598c6e334326f1f35 100644
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
@@ -1,3 +1,835 @@
 <template>
-  <span>开发中</span>
+  <div class="app-container">
+    <doc-alert title="公众号图文" url="https://doc.iocoder.cn/mp/article/" />
+
+    <!-- 搜索工作栏 -->
+    <el-form
+      :model="queryParams"
+      ref="queryFormRef"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="公众号" prop="accountId">
+        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
+          <el-option
+            v-for="item in accountList"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mp:draft:create']"
+          >新增
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @query-table="getList" />
+    </el-row>
+
+    <!-- 列表 -->
+    <div class="waterfall" v-loading="loading">
+      <template v-for="item in list" :key="item.articleId">
+        <div class="waterfall-item" v-if="item.content && item.content.newsItem">
+          <wx-news :articles="item.content.newsItem" />
+          <!-- 操作按钮 -->
+          <el-row class="ope-row">
+            <el-button
+              type="success"
+              circle
+              @click="handlePublish(item)"
+              v-hasPermi="['mp:free-publish:submit']"
+              >发布</el-button
+            >
+            <el-button
+              type="primary"
+              icon="el-icon-edit"
+              circle
+              @click="handleUpdate(item)"
+              v-hasPermi="['mp:draft:update']"
+            />
+            <el-button
+              type="danger"
+              icon="el-icon-delete"
+              circle
+              @click="handleDelete(item)"
+              v-hasPermi="['mp:draft:delete']"
+            />
+          </el-row>
+        </div>
+      </template>
+    </div>
+    <!-- 分页记录 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改草稿对话框 -->
+    <Teleport to="body">
+      <el-dialog
+        :title="operateMaterial === 'add' ? '新建图文' : '修改图文'"
+        width="80%"
+        top="20px"
+        v-model="dialogNewsVisible"
+        :before-close="dialogNewsClose"
+        :close-on-click-modal="false"
+      >
+        <div class="left">
+          <div class="select-item">
+            <div v-for="(news, index) in articlesAdd" :key="news.id">
+              <div
+                class="news-main father"
+                v-if="index === 0"
+                :class="{ activeAddNews: isActiveAddNews === index }"
+                @click="activeNews(index)"
+              >
+                <div class="news-content">
+                  <img class="material-img" v-if="news.thumbUrl" :src="news.thumbUrl" />
+                  <div class="news-content-title">{{ news.title }}</div>
+                </div>
+                <div class="child" v-if="articlesAdd.length > 1">
+                  <el-button type="mini" icon="el-icon-sort-down" @click="downNews(index)"
+                    >下移</el-button
+                  >
+                  <el-button
+                    v-if="operateMaterial === 'add'"
+                    type="mini"
+                    icon="el-icon-delete"
+                    @click="minusNews(index)"
+                    >删除
+                  </el-button>
+                </div>
+              </div>
+              <div
+                class="news-main-item father"
+                v-if="index > 0"
+                :class="{ activeAddNews: isActiveAddNews === index }"
+                @click="activeNews(index)"
+              >
+                <div class="news-content-item">
+                  <div class="news-content-item-title">{{ news.title }}</div>
+                  <div class="news-content-item-img">
+                    <img
+                      class="material-img"
+                      v-if="news.thumbUrl"
+                      :src="news.thumbUrl"
+                      height="100%"
+                    />
+                  </div>
+                </div>
+                <div class="child">
+                  <el-button
+                    v-if="articlesAdd.length > index + 1"
+                    type="mini"
+                    icon="el-icon-sort-down"
+                    @click="downNews(index)"
+                    >下移
+                  </el-button>
+                  <el-button type="mini" icon="el-icon-sort-up" @click="upNews(index)"
+                    >上移</el-button
+                  >
+                  <el-button
+                    v-if="operateMaterial === 'add'"
+                    type="mini"
+                    icon="el-icon-delete"
+                    @click="minusNews(index)"
+                    >删除
+                  </el-button>
+                </div>
+              </div>
+            </div>
+            <el-row justify="center" class="ope-row">
+              <el-button
+                type="primary"
+                circle
+                @click="plusNews(item)"
+                v-if="articlesAdd.length < 8 && operateMaterial === 'add'"
+              >
+                <Icon icon="ep:plus" />
+              </el-button>
+            </el-row>
+          </div>
+        </div>
+        <div class="right" v-loading="addMaterialLoading" v-if="articlesAdd.length > 0">
+          <br />
+          <br />
+          <br />
+          <br />
+          <!-- 标题、作者、原文地址 -->
+          <el-input v-model="articlesAdd[isActiveAddNews].title" placeholder="请输入标题（必填）" />
+          <el-input
+            v-model="articlesAdd[isActiveAddNews].author"
+            placeholder="请输入作者"
+            style="margin-top: 5px"
+          />
+          <el-input
+            v-model="articlesAdd[isActiveAddNews].contentSourceUrl"
+            placeholder="请输入原文地址"
+            style="margin-top: 5px"
+          />
+          <!-- 封面和摘要 -->
+          <div class="input-tt">封面和摘要：</div>
+          <div>
+            <div class="thumb-div">
+              <img
+                class="material-img"
+                v-if="articlesAdd[isActiveAddNews].thumbUrl"
+                :src="articlesAdd[isActiveAddNews].thumbUrl"
+                :class="isActiveAddNews === 0 ? 'avatar' : 'avatar1'"
+              />
+              <Icon
+                v-else
+                icon="ep:plus"
+                class="avatar-uploader-icon"
+                :class="isActiveAddNews === 0 ? 'avatar' : 'avatar1'"
+              />
+              <div class="thumb-but">
+                <el-upload
+                  :action="actionUrl"
+                  :headers="headers"
+                  multiple
+                  :limit="1"
+                  :file-list="fileList"
+                  :data="uploadData"
+                  :before-upload="beforeThumbImageUpload"
+                  :on-success="handleUploadSuccess"
+                >
+                  <template #trigger>
+                    <el-button size="mini" type="primary">本地上传</el-button>
+                  </template>
+                  <el-button
+                    size="mini"
+                    type="primary"
+                    @click="openMaterial"
+                    style="margin-left: 5px"
+                    >素材库选择</el-button
+                  >
+                  <template #tip>
+                    <div class="el-upload__tip">支持 bmp/png/jpeg/jpg/gif 格式，大小不超过 2M</div>
+                  </template>
+                </el-upload>
+              </div>
+              <Teleport to="body">
+                <el-dialog title="选择图片" v-model="dialogImageVisible" width="80%">
+                  <WxMaterialSelect
+                    ref="materialSelectRef"
+                    :objData="{ type: 'image', accountId: queryParams.accountId }"
+                    @select-material="selectMaterial"
+                  />
+                </el-dialog>
+              </Teleport>
+            </div>
+            <el-input
+              :rows="8"
+              type="textarea"
+              v-model="articlesAdd[isActiveAddNews].digest"
+              placeholder="请输入摘要"
+              class="digest"
+              maxlength="120"
+              style="float: right"
+            />
+          </div>
+          <!--富文本编辑器组件-->
+          <el-row>
+            <wx-editor
+              v-model="articlesAdd[isActiveAddNews].content"
+              :account-id="uploadData.accountId"
+              v-if="hackResetEditor"
+            />
+          </el-row>
+        </div>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="dialogNewsVisible = false">取 消</el-button>
+            <el-button type="primary" @click="submitForm">提 交</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </Teleport>
+  </div>
 </template>
+
+<script setup name="MpDraft">
+import { ref, onMounted, reactive, nextTick } from 'vue'
+// import type { FormInstance } from 'element-plus'
+import WxEditor from '@/views/mp/components/wx-editor/WxEditor.vue'
+import WxNews from '@/views/mp/components/wx-news/main.vue'
+import WxMaterialSelect from '@/views/mp/components/wx-material-select/main.vue'
+import { getAccessToken } from '@/utils/auth'
+import { createDraft, deleteDraft, getDraftPage, updateDraft } from '@/api/mp/draft'
+import { getSimpleAccountList } from '@/api/mp/account'
+import { submitFreePublish } from '@/api/mp/freePublish'
+
+const BASE_URL = import.meta.env.VITE_BASE_URL
+
+const message = useMessage()
+
+const materialSelectRef = ref()
+const queryFormRef = ref()
+
+// 遮罩层
+const loading = ref(false)
+// 显示搜索条件
+const showSearch = ref(true)
+// 总条数
+const total = ref(0)
+// 数据列表
+const list = ref([])
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  accountId: undefined
+})
+
+// ========== 文件上传 ==========
+const actionUrl = ref(BASE_URL + '/admin-api/mp/material/upload-permanent') // 上传永久素材的地址
+const headers = ref({ Authorization: 'Bearer ' + getAccessToken() }) // 设置上传的请求头部
+const fileList = ref([])
+const uploadData = reactive({
+  type: 'image',
+  accountId: 1
+})
+
+// ========== 草稿新建 or 修改 ==========
+const dialogNewsVisible = ref(false)
+const addMaterialLoading = ref(false) // 添加草稿的 loading 标识
+const articlesAdd = ref([])
+const isActiveAddNews = ref(0)
+const dialogImageVisible = ref(false)
+const operateMaterial = ref('add')
+const articlesMediaId = ref('')
+const hackResetEditor = ref(false)
+// 公众号账号列表
+const accountList = ref([])
+
+onMounted(async () => {
+  accountList.value = await getSimpleAccountList()
+  // 选中第一个
+  if (accountList.value.length > 0) {
+    // @ts-ignore
+    queryParams.accountId = accountList.value[0].id
+  }
+  await getList()
+})
+
+// ======================== 列表查询 ========================
+/** 设置账号编号 */
+const setAccountId = (accountId) => {
+  queryParams.accountId = accountId
+  uploadData.accountId = accountId
+}
+
+/** 查询列表 */
+const getList = async () => {
+  // 如果没有选中公众号账号，则进行提示。
+  if (!queryParams.accountId) {
+    message.error('未选中公众号，无法查询草稿箱')
+    return false
+  }
+
+  loading.value = true
+  try {
+    const { data } = await getDraftPage(queryParams)
+    data.list.forEach((item) => {
+      const newsItem = item.content.newsItem
+      // 将 thumbUrl 转成 picUrl，保证 wx-news 组件可以预览封面
+      newsItem.forEach((article) => {
+        article.picUrl = article.thumbUrl
+      })
+    })
+    list.value = response.data.list
+    total.value = response.data.total
+  } catch {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  // 默认选中第一个
+  if (queryParams.accountId) {
+    setAccountId(queryParams.accountId)
+  }
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  // 默认选中第一个
+  if (accountList.value.length > 0) {
+    setAccountId(accountList.value[0].id)
+  }
+  handleQuery()
+}
+
+// ======================== 新增/修改草稿 ========================
+/** 新增按钮操作 */
+const handleAdd = () => {
+  resetEditor()
+  reset()
+  // 打开表单，并设置初始化
+  operateMaterial.value = 'add'
+  dialogNewsVisible.value = true
+}
+
+/** 更新按钮操作 */
+const handleUpdate = (item) => {
+  resetEditor()
+  reset()
+  articlesMediaId.value = item.mediaId
+  articlesAdd.value = JSON.parse(JSON.stringify(item.content.newsItem))
+  // 打开表单，并设置初始化
+  operateMaterial.value = 'edit'
+  dialogNewsVisible.value = true
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  addMaterialLoading.value = true
+  if (operateMaterial.value === 'add') {
+    createDraft(queryParams.accountId, articlesAdd.value)
+      .then(() => {
+        message.notifySuccess('新增成功')
+        dialogNewsVisible.value = false
+        getList()
+      })
+      .finally(() => {
+        addMaterialLoading.value = false
+      })
+  } else {
+    updateDraft(queryParams.accountId, articlesMediaId.value, articlesAdd.value)
+      .then(() => {
+        message.notifySuccess('更新成功')
+        dialogNewsVisible.value = false
+        getList()
+      })
+      .finally(() => {
+        addMaterialLoading.value = false
+      })
+  }
+}
+
+// 关闭弹窗
+const dialogNewsClose = async (done) => {
+  try {
+    await message.confirm('修改内容可能还未保存，确定关闭吗?')
+    reset()
+    resetEditor()
+    done()
+  } catch {}
+}
+
+// 表单重置
+const reset = () => {
+  isActiveAddNews.value = 0
+  articlesAdd.value = [buildEmptyArticle()]
+}
+
+// 表单 Editor 重置
+const resetEditor = () => {
+  hackResetEditor.value = false // 销毁组件
+  nextTick(() => {
+    hackResetEditor.value = true // 重建组件
+  })
+}
+
+// 将图文向下移动
+const downNews = (index) => {
+  let temp = articlesAdd.value[index]
+  articlesAdd.value[index] = articlesAdd.value[index + 1]
+  articlesAdd.value[index + 1] = temp
+  isActiveAddNews.value = index + 1
+}
+
+// 将图文向上移动
+const upNews = (index) => {
+  let temp = articlesAdd.value[index]
+  articlesAdd.value[index] = articlesAdd.value[index - 1]
+  articlesAdd.value[index - 1] = temp
+  isActiveAddNews.value = index - 1
+}
+
+// 选中指定 index 的图文
+const activeNews = (index) => {
+  resetEditor()
+  isActiveAddNews.value = index
+}
+
+// 删除指定 index 的图文
+const minusNews = async (index) => {
+  try {
+    await message.confirm('确定删除该图文吗?')
+    articlesAdd.value.splice(index, 1)
+    if (isActiveAddNews.value === index) {
+      isActiveAddNews.value = 0
+    }
+  } catch {}
+}
+
+// 添加一个图文
+const plusNews = () => {
+  articlesAdd.value.push(buildEmptyArticle())
+  isActiveAddNews.value = articlesAdd.value.length - 1
+}
+
+// 创建空的 article
+const buildEmptyArticle = () => {
+  return {
+    title: '',
+    thumbMediaId: '',
+    author: '',
+    digest: '',
+    showCoverPic: '',
+    content: '',
+    contentSourceUrl: '',
+    needOpenComment: '',
+    onlyFansCanComment: '',
+    thumbUrl: ''
+  }
+}
+
+// ======================== 文件上传 ========================
+const beforeThumbImageUpload = (file) => {
+  addMaterialLoading.value = true
+  const isType =
+    file.type === 'image/jpeg' ||
+    file.type === 'image/png' ||
+    file.type === 'image/gif' ||
+    file.type === 'image/bmp' ||
+    file.type === 'image/jpg'
+  if (!isType) {
+    message.error('上传图片格式不对!')
+    addMaterialLoading.value = false
+    return false
+  }
+  const isLt = file.size / 1024 / 1024 < 2
+  if (!isLt) {
+    message.error('上传图片大小不能超过 2M!')
+    addMaterialLoading.value = false
+    return false
+  }
+  // 校验通过
+  return true
+}
+
+const handleUploadSuccess = (response, file, fileList) => {
+  addMaterialLoading.value = false
+  if (response.code !== 0) {
+    message.error('上传出错：' + response.msg)
+    return false
+  }
+
+  // 重置上传文件的表单
+  fileList.value = []
+
+  // 设置草稿的封面字段
+  articlesAdd.value[isActiveAddNews.value].thumbMediaId = response.data.mediaId
+  articlesAdd.value[isActiveAddNews.value].thumbUrl = response.data.url
+}
+
+// 选择 or 上传完素材，设置回草稿
+const selectMaterial = (item) => {
+  dialogImageVisible.value = false
+  articlesAdd.value[isActiveAddNews.value].thumbMediaId = item.mediaId
+  articlesAdd.value[isActiveAddNews.value].thumbUrl = item.url
+}
+
+// 打开素材选择
+const openMaterial = () => {
+  dialogImageVisible.value = true
+  try {
+    materialSelectRef.value.queryParams.accountId = queryParams.accountId // 强制设置下 accountId，避免二次查询不对
+    materialSelectRef.value.handleQuery() // 刷新列表，失败也无所谓
+  } catch (e) {}
+}
+
+// ======================== 草稿箱发布 ========================
+const handlePublish = async (item) => {
+  const accountId = queryParams.accountId
+  const mediaId = item.mediaId
+  const content =
+    '你正在通过发布的方式发表内容。 发布不占用群发次数，一天可多次发布。已发布内容不会推送给用户，也不会展示在公众号主页中。 发布后，你可以前往发表记录获取链接，也可以将发布内容添加到自定义菜单、自动回复、话题和页面模板中。'
+  try {
+    await message.confirm(content)
+    await submitFreePublish(accountId, mediaId)
+    getList()
+    message.notifySuccess('发布成功')
+  } catch {}
+}
+
+const handleDelete = async (item) => {
+  const accountId = queryParams.accountId
+  const mediaId = item.mediaId
+  try {
+    await message.confirm('此操作将永久删除该草稿, 是否继续?')
+    await deleteDraft(accountId, mediaId)
+    getList()
+    message.notifySuccess('删除成功')
+  } catch {}
+}
+</script>
+
+<style lang="scss" scoped>
+.pagination {
+  float: right;
+  margin-right: 25px;
+}
+
+.add_but {
+  padding: 10px;
+}
+
+.ope-row {
+  margin-top: 5px;
+  text-align: center;
+  border-top: 1px solid #eaeaea;
+  padding-top: 5px;
+}
+
+.item-name {
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: center;
+}
+
+.el-upload__tip {
+  margin-left: 5px;
+}
+
+/*新增图文*/
+.left {
+  display: inline-block;
+  width: 35%;
+  vertical-align: top;
+  margin-top: 200px;
+}
+
+.right {
+  display: inline-block;
+  width: 60%;
+  margin-top: -40px;
+}
+
+.avatar-uploader {
+  width: 20%;
+  display: inline-block;
+}
+
+.avatar-uploader .el-upload {
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  text-align: unset !important;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #165dff;
+}
+
+.avatar-uploader-icon {
+  border: 1px solid #d9d9d9;
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
+
+.avatar {
+  width: 230px;
+  height: 120px;
+}
+
+.avatar1 {
+  width: 120px;
+  height: 120px;
+}
+
+.digest {
+  width: 60%;
+  display: inline-block;
+  vertical-align: top;
+}
+
+/*新增图文*/
+/*瀑布流样式*/
+.waterfall {
+  width: 100%;
+  column-gap: 10px;
+  column-count: 5;
+  margin: 0 auto;
+}
+
+.waterfall-item {
+  padding: 10px;
+  margin-bottom: 10px;
+  break-inside: avoid;
+  border: 1px solid #eaeaea;
+}
+
+p {
+  line-height: 30px;
+}
+
+@media (min-width: 992px) and (max-width: 1300px) {
+  .waterfall {
+    column-count: 3;
+  }
+
+  p {
+    color: red;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 991px) {
+  .waterfall {
+    column-count: 2;
+  }
+
+  p {
+    color: orange;
+  }
+}
+
+@media (max-width: 767px) {
+  .waterfall {
+    column-count: 1;
+  }
+}
+
+/*瀑布流样式*/
+.news-main {
+  background-color: #ffffff;
+  width: 100%;
+  margin: auto;
+  height: 120px;
+}
+
+.news-content {
+  background-color: #acadae;
+  width: 100%;
+  height: 120px;
+  position: relative;
+}
+
+.news-content-title {
+  display: inline-block;
+  font-size: 15px;
+  color: #ffffff;
+  position: absolute;
+  left: 0px;
+  bottom: 0px;
+  background-color: black;
+  width: 98%;
+  padding: 1%;
+  opacity: 0.65;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 25px;
+}
+
+.news-main-item {
+  background-color: #ffffff;
+  padding: 5px 0px;
+  border-top: 1px solid #eaeaea;
+  width: 100%;
+  margin: auto;
+}
+
+.news-content-item {
+  position: relative;
+  margin-left: -3px;
+}
+
+.news-content-item-title {
+  display: inline-block;
+  font-size: 12px;
+  width: 70%;
+}
+
+.news-content-item-img {
+  display: inline-block;
+  width: 25%;
+  background-color: #acadae;
+}
+
+.input-tt {
+  padding: 5px;
+}
+
+.activeAddNews {
+  border: 5px solid #2bb673;
+}
+
+.news-main-plus {
+  width: 280px;
+  text-align: center;
+  margin: auto;
+  height: 50px;
+}
+
+.icon-plus {
+  margin: 10px;
+  font-size: 25px;
+}
+
+.select-item {
+  width: 60%;
+  padding: 10px;
+  margin: 0 auto 10px auto;
+  border: 1px solid #eaeaea;
+}
+
+.father .child {
+  display: none;
+  text-align: center;
+  position: relative;
+  bottom: 25px;
+}
+
+.father:hover .child {
+  display: block;
+}
+
+.thumb-div {
+  display: inline-block;
+  width: 30%;
+  text-align: center;
+}
+
+.thumb-but {
+  margin: 5px;
+}
+
+.material-img {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/mp/freePublish/index.vue b/src/views/mp/freePublish/index.vue
index 565d2da5ec7b8de5779978d7c1ca86065b53dd6f..338b80c517ab38c3e04a4c1b49c75cb96f2eed97 100644
--- a/src/views/mp/freePublish/index.vue
+++ b/src/views/mp/freePublish/index.vue
@@ -21,8 +21,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" />搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" />重置</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>