From dbb1a6fc98447c405aaa6d944e2a4edb7fd06410 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 14 Apr 2023 18:06:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=9D=E8=AF=95=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E3=80=90=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86=E3=80=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c4746fc804a7fe127ce63d92de121076bdb91b58)
---
 src/views/mp/message/DataGrid.vue | 147 ++++++++++++++++++++++++
 src/views/mp/message/index.vue    | 183 ++++++------------------------
 2 files changed, 179 insertions(+), 151 deletions(-)
 create mode 100644 src/views/mp/message/DataGrid.vue

diff --git a/src/views/mp/message/DataGrid.vue b/src/views/mp/message/DataGrid.vue
new file mode 100644
index 00000000..eaa85e5b
--- /dev/null
+++ b/src/views/mp/message/DataGrid.vue
@@ -0,0 +1,147 @@
+<template>
+  <div>
+    <el-table v-loading="props.loading" :data="props.list">
+      <el-table-column
+        label="发送时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="消息类型" align="center" prop="type" width="80" />
+      <el-table-column label="发送方" align="center" prop="sendFrom" width="80">
+        <template #default="scope">
+          <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag>
+          <el-tag v-else type="info">公众号</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户标识" align="center" prop="openid" width="300" />
+      <el-table-column label="内容" prop="content">
+        <template #default="scope">
+          <!-- 【事件】区域 -->
+          <div v-if="scope.row.type === MsgType.Event && scope.row.event === 'subscribe'">
+            <el-tag type="success">关注</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'unsubscribe'">
+            <el-tag type="danger">取消关注</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'CLICK'">
+            <el-tag>点击菜单</el-tag>
+            【{{ scope.row.eventKey }}】
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'VIEW'">
+            <el-tag>点击菜单链接</el-tag>
+            【{{ scope.row.eventKey }}】
+          </div>
+          <div
+            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'scancode_waitmsg'"
+          >
+            <el-tag>扫码结果</el-tag>
+            【{{ scope.row.eventKey }}】
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'scancode_push'">
+            <el-tag>扫码结果</el-tag>
+            【{{ scope.row.eventKey }}】
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_sysphoto'">
+            <el-tag>系统拍照发图</el-tag>
+          </div>
+          <div
+            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_photo_or_album'"
+          >
+            <el-tag>拍照或者相册</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_weixin'">
+            <el-tag>微信相册</el-tag>
+          </div>
+          <div
+            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'location_select'"
+          >
+            <el-tag>选择地理位置</el-tag>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Event">
+            <el-tag type="danger">未知事件类型</el-tag>
+          </div>
+          <!-- 【消息】区域 -->
+          <div v-else-if="scope.row.type === MsgType.Text">{{ scope.row.content }}</div>
+          <div v-else-if="scope.row.type === MsgType.Voice">
+            <wx-voice-player :url="scope.row.mediaUrl" :content="scope.row.recognition" />
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Image">
+            <a target="_blank" :href="scope.row.mediaUrl">
+              <img :src="scope.row.mediaUrl" style="width: 100px" />
+            </a>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Video || scope.row.type === 'shortvideo'">
+            <wx-video-player :url="scope.row.mediaUrl" style="margin-top: 10px" />
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Link">
+            <el-tag>链接</el-tag>
+            ：
+            <a :href="scope.row.url" target="_blank">{{ scope.row.title }}</a>
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Location">
+            <WxLocation
+              :label="scope.row.label"
+              :location-y="scope.row.locationY"
+              :location-x="scope.row.locationX"
+            />
+          </div>
+          <div v-else-if="scope.row.type === MsgType.Music">
+            <WxMusic
+              :title="scope.row.title"
+              :description="scope.row.description"
+              :thumb-media-url="scope.row.thumbMediaUrl"
+              :music-url="scope.row.musicUrl"
+              :hq-music-url="scope.row.hqMusicUrl"
+            />
+          </div>
+          <div v-else-if="scope.row.type === MsgType.News">
+            <WxNews :articles="scope.row.articles" />
+          </div>
+          <div v-else>
+            <el-tag type="danger">未知消息类型</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="emit('send', scope.row.userId)"
+            v-hasPermi="['mp:message:send']"
+          >
+            消息
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+  </div>
+</template>
+
+<script setup lang="ts">
+import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
+import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
+import WxLocation from '@/views/mp/components/wx-location/main.vue'
+import WxMusic from '@/views/mp/components/wx-music/main.vue'
+import WxNews from '@/views/mp/components/wx-news/main.vue'
+import { dateFormatter } from '@/utils/formatTime'
+import { MsgType } from '@/views/mp/components/wx-msg/types'
+
+const props = defineProps({
+  list: {
+    type: Array,
+    required: true
+  },
+  loading: {
+    type: Boolean,
+    required: true
+  }
+})
+
+const emit = defineEmits<{ (e: 'send', v: number) }>()
+</script>
+
+<style scoped></style>
diff --git a/src/views/mp/message/index.vue b/src/views/mp/message/index.vue
index 4ab19fda..ca7e0d7e 100644
--- a/src/views/mp/message/index.vue
+++ b/src/views/mp/message/index.vue
@@ -58,124 +58,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list">
-      <el-table-column
-        label="发送时间"
-        align="center"
-        prop="createTime"
-        width="180"
-        :formatter="dateFormatter"
-      />
-      <el-table-column label="消息类型" align="center" prop="type" width="80" />
-      <el-table-column label="发送方" align="center" prop="sendFrom" width="80">
-        <template #default="scope">
-          <el-tag v-if="scope.row.sendFrom === 1" type="success">粉丝</el-tag>
-          <el-tag v-else type="info">公众号</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="用户标识" align="center" prop="openid" width="300" />
-      <el-table-column label="内容" prop="content">
-        <template #default="scope">
-          <!-- 【事件】区域 -->
-          <div v-if="scope.row.type === MsgType.Event && scope.row.event === 'subscribe'">
-            <el-tag type="success">关注</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'unsubscribe'">
-            <el-tag type="danger">取消关注</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'CLICK'">
-            <el-tag>点击菜单</el-tag>
-            【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'VIEW'">
-            <el-tag>点击菜单链接</el-tag>
-            【{{ scope.row.eventKey }}】
-          </div>
-          <div
-            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'scancode_waitmsg'"
-          >
-            <el-tag>扫码结果</el-tag>
-            【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'scancode_push'">
-            <el-tag>扫码结果</el-tag>
-            【{{ scope.row.eventKey }}】
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_sysphoto'">
-            <el-tag>系统拍照发图</el-tag>
-          </div>
-          <div
-            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_photo_or_album'"
-          >
-            <el-tag>拍照或者相册</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'pic_weixin'">
-            <el-tag>微信相册</el-tag>
-          </div>
-          <div
-            v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'location_select'"
-          >
-            <el-tag>选择地理位置</el-tag>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Event">
-            <el-tag type="danger">未知事件类型</el-tag>
-          </div>
-          <!-- 【消息】区域 -->
-          <div v-else-if="scope.row.type === MsgType.Text">{{ scope.row.content }}</div>
-          <div v-else-if="scope.row.type === MsgType.Voice">
-            <wx-voice-player :url="scope.row.mediaUrl" :content="scope.row.recognition" />
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Image">
-            <a target="_blank" :href="scope.row.mediaUrl">
-              <img :src="scope.row.mediaUrl" style="width: 100px" />
-            </a>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Video || scope.row.type === 'shortvideo'">
-            <wx-video-player :url="scope.row.mediaUrl" style="margin-top: 10px" />
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Link">
-            <el-tag>链接</el-tag>
-            ：
-            <a :href="scope.row.url" target="_blank">{{ scope.row.title }}</a>
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Location">
-            <WxLocation
-              :label="scope.row.label"
-              :location-y="scope.row.locationY"
-              :location-x="scope.row.locationX"
-            />
-          </div>
-          <div v-else-if="scope.row.type === MsgType.Music">
-            <WxMusic
-              :title="scope.row.title"
-              :description="scope.row.description"
-              :thumb-media-url="scope.row.thumbMediaUrl"
-              :music-url="scope.row.musicUrl"
-              :hq-music-url="scope.row.hqMusicUrl"
-            />
-          </div>
-          <div v-else-if="scope.row.type === MsgType.News">
-            <WxNews :articles="scope.row.articles" />
-          </div>
-          <div v-else>
-            <el-tag type="danger">未知消息类型</el-tag>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="handleSend(scope.row)"
-            v-hasPermi="['mp:message:send']"
-          >
-            消息
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
+    <DataGrid :list="list" :loading="loading" @send="handleSend" />
     <Pagination
       v-show="total > 0"
       :total="total"
@@ -183,36 +66,31 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 发送消息的弹窗 -->
-    <el-dialog
-      title="粉丝消息列表"
-      v-model="showMessageBox"
-      @click="showMessageBox = true"
-      width="50%"
-      destroy-on-close
-    >
-      <WxMsg :user-id="userId" />
-    </el-dialog>
   </ContentWrap>
+
+  <!-- 发送消息的弹窗 -->
+  <el-dialog
+    title="粉丝消息列表"
+    v-model="messageBox.show"
+    @click="messageBox.show = true"
+    width="50%"
+    destroy-on-close
+  >
+    <WxMsg :user-id="messageBox.userId" />
+  </el-dialog>
 </template>
 <script setup lang="ts" name="MpMessage">
-import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
-import WxVoicePlayer from '@/views/mp/components/wx-voice-play/main.vue'
-import WxMsg from '@/views/mp/components/wx-msg/main.vue'
-import WxLocation from '@/views/mp/components/wx-location/main.vue'
-import WxMusic from '@/views/mp/components/wx-music/main.vue'
-import WxNews from '@/views/mp/components/wx-news/main.vue'
-import WxAccountSelect from '@/views/mp/components/wx-account-select/main.vue'
 import * as MpMessageApi from '@/api/mp/message'
+import WxMsg from '@/views/mp/components/wx-msg/main.vue'
+import WxAccountSelect from '@/views/mp/components/wx-account-select/main.vue'
+import DataGrid from './DataGrid.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
 import { MsgType } from '@/views/mp/components/wx-msg/types'
 import type { FormInstance } from 'element-plus'
 
-const loading = ref(true) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref<any[]>([]) // 列表的数据
+const loading = ref(false)
+const total = ref(0) // 数据的总页数
+const list = ref<any[]>([]) // 当前页的列表数据
 
 // 搜索参数
 interface QueryParams {
@@ -232,8 +110,12 @@ const queryParams: QueryParams = reactive({
   createTime: []
 })
 const queryFormRef = ref<FormInstance | null>(null) // 搜索的表单
-const showMessageBox = ref(false) // 是否显示弹出层
-const userId = ref(0) // 操作的用户编号
+
+// 消息对话框
+const messageBox = reactive({
+  show: false,
+  userId: 0
+})
 
 /** 侦听accountId */
 const onAccountChanged = (id?: number) => {
@@ -242,6 +124,11 @@ const onAccountChanged = (id?: number) => {
 }
 
 /** 查询列表 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
 const getList = async () => {
   try {
     loading.value = true
@@ -253,12 +140,6 @@ const getList = async () => {
   }
 }
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
 /** 重置按钮操作 */
 const resetQuery = async () => {
   // 暂存accountId，并在reset后恢复
@@ -269,8 +150,8 @@ const resetQuery = async () => {
 }
 
 /** 打开消息发送窗口 */
-const handleSend = async (row: any) => {
-  userId.value = row.userId
-  showMessageBox.value = true
+const handleSend = async (userId: number) => {
+  messageBox.userId = userId
+  messageBox.show = true
 }
 </script>