From daa124a47856fe50090ed5deb4bea0bd43786405 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 9 Apr 2023 11:59:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mp/autoReply/index.vue | 434 ++++++++++++++++++++++++++++++-
 1 file changed, 433 insertions(+), 1 deletion(-)

diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue
index 497f72ec..35fbc504 100644
--- a/src/views/mp/autoReply/index.vue
+++ b/src/views/mp/autoReply/index.vue
@@ -1,3 +1,435 @@
 <template>
-  <span>开发中</span>
+  <div class="app-container">
+    <doc-alert title="自动回复" url="https://doc.iocoder.cn/mp/auto-reply/" />
+
+    <!-- 搜索工作栏 -->
+    <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 accounts"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <ContentWrap>
+      <!-- tab 切换 -->
+      <el-tabs v-model="type" @tab-change="handleTabChange">
+        <!-- 操作工具栏 -->
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              size="small"
+              @click="handleAdd"
+              v-hasPermi="['mp:auto-reply:create']"
+              v-if="type !== '1' || list.length <= 0"
+              ><Icon icon="ep:plus" />新增
+            </el-button>
+          </el-col>
+          <!-- <right-toolbar v-model:showSearch="showSearch" @query-table="getList" /> -->
+        </el-row>
+        <!-- tab 项 -->
+        <el-tab-pane name="1">
+          <template #label>
+            <span><Icon icon="ep:star-off" /> 关注时回复</span>
+          </template>
+        </el-tab-pane>
+        <el-tab-pane name="2">
+          <template #label>
+            <span><Icon icon="ep:chat-line-round" /> 消息回复</span>
+          </template>
+        </el-tab-pane>
+        <el-tab-pane name="3">
+          <template #label>
+            <span><Icon icon="ep:news" /> 关键词回复</span>
+          </template>
+        </el-tab-pane>
+      </el-tabs>
+
+      <!-- 列表 -->
+      <el-table v-loading="loading" :data="list">
+        <el-table-column
+          label="请求消息类型"
+          align="center"
+          prop="requestMessageType"
+          v-if="type === '2'"
+        />
+        <el-table-column label="关键词" align="center" prop="requestKeyword" v-if="type === '3'" />
+        <el-table-column label="匹配类型" align="center" prop="requestMatch" v-if="type === '3'">
+          <template #default="scope">
+            <dict-tag
+              :type="DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH"
+              :value="scope.row.requestMatch"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="回复消息类型" align="center">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.MP_MESSAGE_TYPE" :value="scope.row.responseMessageType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="回复内容" align="center">
+          <template #default="scope">
+            <div v-if="scope.row.responseMessageType === 'text'">{{
+              scope.row.responseContent
+            }}</div>
+            <div v-else-if="scope.row.responseMessageType === 'voice'">
+              <WxVoicePlayer :url="scope.row.responseMediaUrl" />
+            </div>
+            <div v-else-if="scope.row.responseMessageType === 'image'">
+              <a target="_blank" :href="scope.row.responseMediaUrl">
+                <img :src="scope.row.responseMediaUrl" style="width: 100px" />
+              </a>
+            </div>
+            <div
+              v-else-if="
+                scope.row.responseMessageType === 'video' ||
+                scope.row.responseMessageType === 'shortvideo'
+              "
+            >
+              <WxVideoPlayer :url="scope.row.responseMediaUrl" style="margin-top: 10px" />
+            </div>
+            <div v-else-if="scope.row.responseMessageType === 'news'">
+              <WxNews :articles="scope.row.responseArticles" />
+            </div>
+            <div v-else-if="scope.row.responseMessageType === 'music'">
+              <WxMusic
+                :title="scope.row.responseTitle"
+                :description="scope.row.responseDescription"
+                :thumb-media-url="scope.row.responseThumbMediaUrl"
+                :music-url="scope.row.responseMusicUrl"
+                :hq-music-url="scope.row.responseHqMusicUrl"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ formatDate(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button
+              size="small"
+              type="primary"
+              link
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['mp:auto-reply:update']"
+              ><Icon icon="ep:edit" />修改
+            </el-button>
+            <el-button
+              size="small"
+              type="primary"
+              link
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['mp:auto-reply:delete']"
+              ><Icon icon="ep:delete" />删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 添加或修改自动回复的对话框 -->
+      <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="消息类型" prop="requestMessageType" v-if="type === '2'">
+            <el-select v-model="form.requestMessageType" placeholder="请选择">
+              <template v-for="dict in getDictOptions(DICT_TYPE.MP_MESSAGE_TYPE)" :key="dict.value">
+                <el-option
+                  v-if="requestMessageTypes.includes(dict.value)"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </template>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="匹配类型" prop="requestMatch" v-if="type === '3'">
+            <el-select
+              v-model="form.requestMatch"
+              placeholder="请选择匹配类型"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="dict in getDictOptions(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="关键词" prop="requestKeyword" v-if="type === '3'">
+            <el-input v-model="form.requestKeyword" placeholder="请输入内容" clearable />
+          </el-form-item>
+          <el-form-item label="回复消息">
+            <WxReplySelect :objData="objData" v-if="hackResetWxReplySelect" />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="cancel">取 消</el-button>
+            <el-button type="primary" @click="handleSubmit">确 定</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </ContentWrap>
+  </div>
 </template>
+
+<script setup>
+import { ref, reactive, onMounted, nextTick } from 'vue'
+import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
+import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
+import WxMusic from '@/views/mp/components/wx-music/main.vue'
+import WxNews from '@/views/mp/components/wx-news/main.vue'
+import WxReplySelect from '@/views/mp/components/wx-reply/main.vue'
+import { getSimpleAccountList } from '@/api/mp/account'
+import {
+  createAutoReply,
+  deleteAutoReply,
+  getAutoReply,
+  getAutoReplyPage,
+  updateAutoReply
+} from '@/api/mp/autoReply'
+
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import { ContentWrap } from '@/components/ContentWrap'
+
+const message = useMessage()
+
+const queryFormRef = ref()
+const formRef = ref()
+
+// tab 类型（1、关注时回复；2、消息回复；3、关键词回复）
+const type = ref('3')
+// 允许选择的请求消息类型
+const requestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link']
+// 遮罩层
+const loading = ref(true)
+// 显示搜索条件
+const showSearch = ref(true)
+// 总条数
+const total = ref(0)
+// 自动回复列表
+const list = ref([])
+// 查询参数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  accountId: undefined
+})
+
+// 弹出层标题
+const title = ref('')
+// 是否显示弹出层
+const open = ref(false)
+// 表单参数
+const form = ref({})
+// 回复消息
+const objData = ref({
+  type: 'text'
+})
+// 表单校验
+const rules = {
+  requestKeyword: [{ required: true, message: '请求的关键字不能为空', trigger: 'blur' }],
+  requestMatch: [{ required: true, message: '请求的关键字的匹配不能为空', trigger: 'blur' }]
+}
+
+const hackResetWxReplySelect = ref(false) // 重置 WxReplySelect 组件，解决无法清除的问题
+
+// 公众号账号列表
+const accounts = ref([])
+
+onMounted(() => {
+  getSimpleAccountList().then((data) => {
+    accounts.value = data
+    // 默认选中第一个
+    if (accounts.value.length > 0) {
+      queryParams.accountId = accounts.value[0].id
+    }
+    // 加载数据
+    getList()
+  })
+})
+
+/** 查询列表 */
+const getList = async () => {
+  // 如果没有选中公众号账号，则进行提示。
+  if (!queryParams.accountId) {
+    message.error('未选中公众号，无法查询自动回复')
+    return false
+  }
+
+  loading.value = false
+  // 处理查询参数
+  let params = {
+    ...queryParams,
+    type: type.value
+  }
+  // 执行查询
+  getAutoReplyPage(params).then((data) => {
+    list.value = data.list
+    total.value = data.total
+    loading.value = false
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields()
+  // 默认选中第一个
+  if (accounts.value.length > 0) {
+    queryParams.accountId = accounts.value[0].id
+  }
+  handleQuery()
+}
+
+const handleTabChange = (tabName) => {
+  type.value = tabName
+  handleQuery()
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset()
+  resetEditor()
+  // 打开表单，并设置初始化
+  open.value = true
+  title.value = '新增自动回复'
+  objData.value = {
+    type: 'text',
+    accountId: queryParams.accountId
+  }
+}
+
+/** 修改按钮操作 */
+const handleUpdate = (row) => {
+  reset()
+  resetEditor()
+  console.log(row)
+
+  getAutoReply(row.id).then((data) => {
+    // 设置属性
+    form.value = { ...data }
+    delete form.value['responseMessageType']
+    delete form.value['responseContent']
+    delete form.value['responseMediaId']
+    delete form.value['responseMediaUrl']
+    delete form.value['responseDescription']
+    delete form.value['responseArticles']
+    objData.value = {
+      type: data.responseMessageType,
+      accountId: queryParams.accountId,
+      content: data.responseContent,
+      mediaId: data.responseMediaId,
+      url: data.responseMediaUrl,
+      title: data.responseTitle,
+      description: data.responseDescription,
+      thumbMediaId: data.responseThumbMediaId,
+      thumbMediaUrl: data.responseThumbMediaUrl,
+      articles: data.responseArticles,
+      musicUrl: data.responseMusicUrl,
+      hqMusicUrl: data.responseHqMusicUrl
+    }
+
+    // 打开表单
+    open.value = true
+    title.value = '修改自动回复'
+  })
+}
+
+const handleSubmit = () => {
+  formRef.value?.validate((valid) => {
+    if (!valid) {
+      return
+    }
+
+    // 处理回复消息
+    const form = { ...form.value }
+    form.responseMessageType = objData.value.type
+    form.responseContent = objData.value.content
+    form.responseMediaId = objData.value.mediaId
+    form.responseMediaUrl = objData.value.url
+    form.responseTitle = objData.value.title
+    form.responseDescription = objData.value.description
+    form.responseThumbMediaId = objData.value.thumbMediaId
+    form.responseThumbMediaUrl = objData.value.thumbMediaUrl
+    form.responseArticles = objData.value.articles
+    form.responseMusicUrl = objData.value.musicUrl
+    form.responseHqMusicUrl = objData.value.hqMusicUrl
+
+    if (form.value.id !== undefined) {
+      updateAutoReply(form).then(() => {
+        message.success('修改成功')
+        open.value = false
+        getList()
+      })
+    } else {
+      createAutoReply(form).then(() => {
+        message.success('新增成功')
+        open.value = false
+        getList()
+      })
+    }
+  })
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {
+    id: undefined,
+    accountId: queryParams.accountId,
+    type: type.value,
+    requestKeyword: undefined,
+    requestMatch: type.value === '3' ? 1 : undefined,
+    requestMessageType: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+// 取消按钮
+const cancel = () => {
+  open.value = false
+  reset()
+}
+
+// 表单 Editor 重置
+const resetEditor = () => {
+  hackResetWxReplySelect.value = false // 销毁组件
+  nextTick(() => {
+    hackResetWxReplySelect.value = true // 重建组件
+  })
+}
+
+const handleDelete = async (row) => {
+  await message.confirm('是否确认删除此数据?')
+  await deleteAutoReply(row.id)
+  await getList()
+  message.success('删除成功')
+}
+</script>

From 4465220ed76f8e44fd5822481c858044cb6f9667 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 9 Apr 2023 13:08:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20size=3D"mini"=20&=20=20type=3D"text"?=
 =?UTF-8?q?=E8=BF=87=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/form/ElementForm.vue        | 25 +++++++++++++++----
 .../package/penal/listeners/template.js       |  8 +++---
 src/views/bpm/definition/index.vue            |  4 +--
 src/views/bpm/model/index.vue                 |  2 +-
 .../mp/components/wx-material-select/main.vue |  4 +--
 src/views/mp/components/wx-reply/main.vue     |  2 +-
 .../mp/components/wx-voice-play/main.vue      |  2 +-
 7 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
index cb96a2fb..cea05550 100644
--- a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
@@ -33,9 +33,15 @@
         />
         <el-table-column label="操作" width="90px">
           <template #default="scope">
-            <el-button type="text" @click="openFieldForm(scope, scope.$index)">编辑</el-button>
+            <el-button type="primary" link @click="openFieldForm(scope, scope.$index)"
+              >编辑</el-button
+            >
             <el-divider direction="vertical" />
-            <el-button type="text" style="color: #ff4d4f" @click="removeField(scope, scope.$index)"
+            <el-button
+              type="primary"
+              link
+              style="color: #ff4d4f"
+              @click="removeField(scope, scope.$index)"
               >移除</el-button
             >
           </template>
@@ -97,7 +103,10 @@
           <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />
           <el-table-column label="操作" width="90px">
             <template #default="scope">
-              <el-button type="text" @click="openFieldOptionForm(scope, scope.$index, 'enum')"
+              <el-button
+                type="primary"
+                link
+                @click="openFieldOptionForm(scope, scope.$index, 'enum')"
                 >编辑</el-button
               >
               <el-divider direction="vertical" />
@@ -126,7 +135,10 @@
         <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />
         <el-table-column label="操作" width="90px">
           <template #default="scope">
-            <el-button type="text" @click="openFieldOptionForm(scope, scope.$index, 'constraint')"
+            <el-button
+              type="primary"
+              link
+              @click="openFieldOptionForm(scope, scope.$index, 'constraint')"
               >编辑</el-button
             >
             <el-divider direction="vertical" />
@@ -154,7 +166,10 @@
         <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
         <el-table-column label="操作" width="90px">
           <template #default="scope">
-            <el-button type="text" @click="openFieldOptionForm(scope, scope.$index, 'property')"
+            <el-button
+              type="primary"
+              link
+              @click="openFieldOptionForm(scope, scope.$index, 'property')"
               >编辑</el-button
             >
             <el-divider direction="vertical" />
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/template.js b/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
index 37b9c76a..430dc64b 100644
--- a/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
@@ -7,9 +7,9 @@ export const template = (isTaskListener) => {
       <el-table-column label="监听器类型" min-width="100px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作" width="90px">
         <template #default="scope">
-          <el-button size="small" type="text" @click="openListenerForm(scope, scope.$index)">编辑</el-button>
+          <el-button size="small" type="primary" link @click="openListenerForm(scope, scope.$index)">编辑</el-button>
           <el-divider direction="vertical" />
-          <el-button size="small" type="text" style="color: #ff4d4f" @click="removeListener(scope, scope.$index)">移除</el-button>
+          <el-button size="small" type="primary" link style="color: #ff4d4f" @click="removeListener(scope, scope.$index)">移除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -125,9 +125,9 @@ export const template = (isTaskListener) => {
         <el-table-column label="字段值/表达式" min-width="100px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作" width="100px">
           <template #default="scope">
-            <el-button size="small" type="text" @click="openListenerFieldForm(scope, scope.$index)">编辑</el-button>
+            <el-button size="small" type="primary" link @click="openListenerFieldForm(scope, scope.$index)">编辑</el-button>
             <el-divider direction="vertical" />
-            <el-button size="small" type="text" style="color: #ff4d4f" @click="removeListenerField(scope, scope.$index)">移除</el-button>
+            <el-button size="small" type="primary" link style="color: #ff4d4f" @click="removeListenerField(scope, scope.$index)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/bpm/definition/index.vue b/src/views/bpm/definition/index.vue
index 66a6a23b..8bb92feb 100644
--- a/src/views/bpm/definition/index.vue
+++ b/src/views/bpm/definition/index.vue
@@ -4,7 +4,7 @@
       <el-table-column label="定义编号" align="center" prop="id" width="400" />
       <el-table-column label="流程名称" align="center" prop="name" width="200">
         <template #default="scope">
-          <el-button type="text" @click="handleBpmnDetail(scope.row)">
+          <el-button type="primary" link @click="handleBpmnDetail(scope.row)">
             <span>{{ scope.row.name }}</span>
           </el-button>
         </template>
@@ -23,7 +23,7 @@
           >
             <span>{{ scope.row.formName }}</span>
           </el-button>
-          <el-button v-else type="text" @click="handleFormDetail(scope.row)">
+          <el-button v-else type="primary" link @click="handleFormDetail(scope.row)">
             <span>{{ scope.row.formCustomCreatePath }}</span>
           </el-button>
         </template>
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index 9a0d725f..8faf642f 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -65,7 +65,7 @@
       <el-table-column label="流程标识" align="center" prop="key" width="200" />
       <el-table-column label="流程名称" align="center" prop="name" width="200">
         <template #default="scope">
-          <el-button type="text" @click="handleBpmnDetail(scope.row)">
+          <el-button type="primary" link @click="handleBpmnDetail(scope.row)">
             <span>{{ scope.row.name }}</span>
           </el-button>
         </template>
diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue
index bcf38027..19f39814 100644
--- a/src/views/mp/components/wx-material-select/main.vue
+++ b/src/views/mp/components/wx-material-select/main.vue
@@ -51,7 +51,7 @@
           class-name="small-padding fixed-width"
         >
           <template #default="scope">
-            <el-button type="text" @click="selectMaterialFun(scope.row)"
+            <el-button type="primary" link @click="selectMaterialFun(scope.row)"
               >选择<Icon icon="ep:plus" />
             </el-button>
           </template>
@@ -91,7 +91,7 @@
           class-name="small-padding fixed-width"
         >
           <template #default="scope">
-            <el-button type="text" @click="selectMaterialFun(scope.row)"
+            <el-button type="primary" link @click="selectMaterialFun(scope.row)"
               >选择<Icon icon="akar-icons:circle-plus" />
             </el-button>
           </template>
diff --git a/src/views/mp/components/wx-reply/main.vue b/src/views/mp/components/wx-reply/main.vue
index b7bc3443..182e2395 100644
--- a/src/views/mp/components/wx-reply/main.vue
+++ b/src/views/mp/components/wx-reply/main.vue
@@ -259,7 +259,7 @@
                     <template #trigger>
                       <el-button type="text">本地上传</el-button>
                     </template>
-                    <el-button type="text" @click="openMaterial" style="margin-left: 5px"
+                    <el-button type="primary" link @click="openMaterial" style="margin-left: 5px"
                       >素材库选择
                     </el-button>
                   </el-upload>
diff --git a/src/views/mp/components/wx-voice-play/main.vue b/src/views/mp/components/wx-voice-play/main.vue
index 9ec8e2e9..5b9e0dfd 100644
--- a/src/views/mp/components/wx-voice-play/main.vue
+++ b/src/views/mp/components/wx-voice-play/main.vue
@@ -17,7 +17,7 @@
       <span class="amr-duration" v-if="duration">{{ duration }} 秒</span>
     </el-icon>
     <div v-if="content">
-      <el-tag type="success" size="mini">语音识别</el-tag>
+      <el-tag type="success" size="small">语音识别</el-tag>
       {{ content }}
     </div>
   </div>

From 99166ee66448ca0bc7591b50a153b9c54c285db5 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 9 Apr 2023 13:41:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20Merge=E5=90=8E=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mp/autoReply/index.vue              | 105 +++++++++---------
 .../mp/components/wx-material-select/main.vue |   1 -
 src/views/mp/menu/index.vue                   |   7 +-
 3 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/src/views/mp/autoReply/index.vue b/src/views/mp/autoReply/index.vue
index 35fbc504..34aadbd2 100644
--- a/src/views/mp/autoReply/index.vue
+++ b/src/views/mp/autoReply/index.vue
@@ -3,32 +3,33 @@
     <doc-alert title="自动回复" url="https://doc.iocoder.cn/mp/auto-reply/" />
 
     <!-- 搜索工作栏 -->
-    <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 accounts"
-            :key="parseInt(item.id)"
-            :label="item.name"
-            :value="parseInt(item.id)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
-      </el-form-item>
-    </el-form>
-
     <ContentWrap>
-      <!-- tab 切换 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="公众号" prop="accountId">
+          <el-select v-model="queryParams.accountId" placeholder="请选择公众号" class="!w-240px">
+            <el-option
+              v-for="item in accountList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- tab 切换 -->
+    <ContentWrap>
       <el-tabs v-model="type" @tab-change="handleTabChange">
         <!-- 操作工具栏 -->
         <el-row :gutter="10" class="mb8">
@@ -36,7 +37,6 @@
             <el-button
               type="primary"
               plain
-              size="small"
               @click="handleAdd"
               v-hasPermi="['mp:auto-reply:create']"
               v-if="type !== '1' || list.length <= 0"
@@ -62,8 +62,10 @@
           </template>
         </el-tab-pane>
       </el-tabs>
+    </ContentWrap>
 
-      <!-- 列表 -->
+    <!-- 列表 -->
+    <ContentWrap>
       <el-table v-loading="loading" :data="list">
         <el-table-column
           label="请求消息类型"
@@ -82,34 +84,31 @@
         </el-table-column>
         <el-table-column label="回复消息类型" align="center">
           <template #default="scope">
-            <dict-tag :type="DICT_TYPE.MP_MESSAGE_TYPE" :value="scope.row.responseMessageType" />
+            <dict-tag :type="DICT_TYPE.MP_MESSAGE_TYPE" :value="scope.row.responsType" />
           </template>
         </el-table-column>
         <el-table-column label="回复内容" align="center">
           <template #default="scope">
-            <div v-if="scope.row.responseMessageType === 'text'">{{
-              scope.row.responseContent
-            }}</div>
-            <div v-else-if="scope.row.responseMessageType === 'voice'">
+            <div v-if="scope.row.responsType === 'text'">{{ scope.row.responseContent }}</div>
+            <div v-else-if="scope.row.responsType === 'voice'">
               <WxVoicePlayer :url="scope.row.responseMediaUrl" />
             </div>
-            <div v-else-if="scope.row.responseMessageType === 'image'">
+            <div v-else-if="scope.row.responsType === 'image'">
               <a target="_blank" :href="scope.row.responseMediaUrl">
                 <img :src="scope.row.responseMediaUrl" style="width: 100px" />
               </a>
             </div>
             <div
               v-else-if="
-                scope.row.responseMessageType === 'video' ||
-                scope.row.responseMessageType === 'shortvideo'
+                scope.row.responsType === 'video' || scope.row.responsType === 'shortvideo'
               "
             >
               <WxVideoPlayer :url="scope.row.responseMediaUrl" style="margin-top: 10px" />
             </div>
-            <div v-else-if="scope.row.responseMessageType === 'news'">
+            <div v-else-if="scope.row.responsType === 'news'">
               <WxNews :articles="scope.row.responseArticles" />
             </div>
-            <div v-else-if="scope.row.responseMessageType === 'music'">
+            <div v-else-if="scope.row.responsType === 'music'">
               <WxMusic
                 :title="scope.row.responseTitle"
                 :description="scope.row.responseDescription"
@@ -120,9 +119,15 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="180"
+        >
           <template #default="scope">
-            <span>{{ formatDate(scope.row.createTime) }}</span>
+            <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -211,7 +216,7 @@ import {
 } from '@/api/mp/autoReply'
 
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
-import { formatDate } from '@/utils/formatTime'
+import { dateFormatter } from '@/utils/formatTime'
 import { ContentWrap } from '@/components/ContentWrap'
 
 const message = useMessage()
@@ -226,7 +231,7 @@ const requestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'l
 // 遮罩层
 const loading = ref(true)
 // 显示搜索条件
-const showSearch = ref(true)
+// const showSearch = ref(true)
 // 总条数
 const total = ref(0)
 // 自动回复列表
@@ -257,14 +262,14 @@ const rules = {
 const hackResetWxReplySelect = ref(false) // 重置 WxReplySelect 组件，解决无法清除的问题
 
 // 公众号账号列表
-const accounts = ref([])
+const accountList = ref([])
 
 onMounted(() => {
   getSimpleAccountList().then((data) => {
-    accounts.value = data
+    accountList.value = data
     // 默认选中第一个
-    if (accounts.value.length > 0) {
-      queryParams.accountId = accounts.value[0].id
+    if (accountList.value.length > 0) {
+      queryParams.accountId = accountList.value[0].id
     }
     // 加载数据
     getList()
@@ -303,8 +308,8 @@ const handleQuery = () => {
 const resetQuery = () => {
   queryFormRef.value?.resetFields()
   // 默认选中第一个
-  if (accounts.value.length > 0) {
-    queryParams.accountId = accounts.value[0].id
+  if (accountList.value.length > 0) {
+    queryParams.accountId = accountList.value[0].id
   }
   handleQuery()
 }
@@ -336,14 +341,14 @@ const handleUpdate = (row) => {
   getAutoReply(row.id).then((data) => {
     // 设置属性
     form.value = { ...data }
-    delete form.value['responseMessageType']
+    delete form.value['responsType']
     delete form.value['responseContent']
     delete form.value['responseMediaId']
     delete form.value['responseMediaUrl']
     delete form.value['responseDescription']
     delete form.value['responseArticles']
     objData.value = {
-      type: data.responseMessageType,
+      type: data.responsType,
       accountId: queryParams.accountId,
       content: data.responseContent,
       mediaId: data.responseMediaId,
@@ -371,7 +376,7 @@ const handleSubmit = () => {
 
     // 处理回复消息
     const form = { ...form.value }
-    form.responseMessageType = objData.value.type
+    form.responsType = objData.value.type
     form.responseContent = objData.value.content
     form.responseMediaId = objData.value.mediaId
     form.responseMediaUrl = objData.value.url
diff --git a/src/views/mp/components/wx-material-select/main.vue b/src/views/mp/components/wx-material-select/main.vue
index 1a8cc3df..7f565823 100644
--- a/src/views/mp/components/wx-material-select/main.vue
+++ b/src/views/mp/components/wx-material-select/main.vue
@@ -47,7 +47,6 @@
         />
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
-
             <el-button type="primary" link @click="selectMaterialFun(scope.row)"
               >选择<Icon icon="ep:plus" />
             </el-button>
diff --git a/src/views/mp/menu/index.vue b/src/views/mp/menu/index.vue
index 8d979723..2d4b7c76 100644
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
@@ -2,12 +2,7 @@
   <doc-alert title="公众号菜单" url="https://doc.iocoder.cn/mp/menu/" />
   <!-- 搜索工作栏 -->
   <ContentWrap>
-    <el-form
-      class="-mb-15px"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form class="-mb-15px" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" placeholder="请选择公众号" class="!w-240px">
           <el-option