From 77d0d2de044f70d7acca6c7dd92fb1fb7dc2fa1f Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 28 Jul 2025 13:49:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(mp):=20=E4=BC=98=E5=8C=96=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6=E5=92=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新服务端地址使用环境变量
- 增加扫码事件处理
- 优化用户头像显示
- 适配图文消息缩略图
- 完善消息类型展示
---
 src/views/mp/account/index.vue                         |  4 ++--
 src/views/mp/components/wx-msg/components/MsgEvent.vue |  3 +++
 src/views/mp/components/wx-msg/main.vue                | 10 +++++-----
 src/views/mp/components/wx-news/main.vue               |  4 ++--
 src/views/mp/message/MessageTable.vue                  |  7 +++++--
 src/views/mp/user/index.vue                            |  9 +++++++--
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/mp/account/index.vue b/src/views/mp/account/index.vue
index 655170702..200a1e2ea 100644
--- a/src/views/mp/account/index.vue
+++ b/src/views/mp/account/index.vue
@@ -37,7 +37,7 @@
       <el-table-column label="appId" align="center" prop="appId" width="180" />
       <el-table-column label="服务器地址(URL)" align="center" prop="appId" width="360">
         <template #default="scope">
-          {{ 'http://服务端地址/admin-api/mp/open/' + scope.row.appId }}
+          {{ `${serverUrl}/admin-api/mp/open/${scope.row.appId}` }}
         </template>
       </el-table-column>
       <el-table-column label="二维码" align="center" prop="qrCodeUrl">
@@ -120,7 +120,7 @@ const queryParams = reactive({
   appId: null
 })
 const queryFormRef = ref() // 搜索的表单
-
+const serverUrl = import.meta.env.VITE_BASE_URL
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
diff --git a/src/views/mp/components/wx-msg/components/MsgEvent.vue b/src/views/mp/components/wx-msg/components/MsgEvent.vue
index 77beda48a..32eaa09f3 100644
--- a/src/views/mp/components/wx-msg/components/MsgEvent.vue
+++ b/src/views/mp/components/wx-msg/components/MsgEvent.vue
@@ -34,6 +34,9 @@
     <div v-else-if="item.event === 'location_select'">
       <el-tag>选择地理位置</el-tag>
     </div>
+    <div v-else-if="item.event === 'SCAN'">
+      <el-tag>扫码</el-tag>
+    </div>
     <div v-else>
       <el-tag type="danger">未知事件类型</el-tag>
     </div>
diff --git a/src/views/mp/components/wx-msg/main.vue b/src/views/mp/components/wx-msg/main.vue
index 8b7cc3a2b..3e063eddc 100644
--- a/src/views/mp/components/wx-msg/main.vue
+++ b/src/views/mp/components/wx-msg/main.vue
@@ -31,12 +31,12 @@
 </template>
 
 <script lang="ts" setup>
-import WxReplySelect, { Reply, ReplyType } from '@/views/mp/components/wx-reply'
+import WxReplySelect, {Reply, ReplyType} from '@/views/mp/components/wx-reply'
 import MsgList from './components/MsgList.vue'
-import { getMessagePage, sendMessage } from '@/api/mp/message'
-import { getUser } from '@/api/mp/user'
+import {getMessagePage, sendMessage} from '@/api/mp/message'
+import {getUser} from '@/api/mp/user'
 import profile from '@/assets/imgs/profile.jpg'
-import { User } from './types'
+import {User} from './types'
 
 defineOptions({ name: 'WxMsg' })
 
@@ -82,7 +82,7 @@ const msgDivRef = ref<HTMLDivElement | null>(null) // 消息显示窗口ref，
 onMounted(async () => {
   const data = await getUser(props.userId)
   user.nickname = data.nickname?.length > 0 ? data.nickname : user.nickname
-  user.avatar = user.avatar?.length > 0 ? data.avatar : user.avatar
+  user.avatar = data.headImageUrl?.length > 0 ? data.headImageUrl : user.avatar
   accountId.value = data.accountId
   reply.value.accountId = data.accountId
 
diff --git a/src/views/mp/components/wx-news/main.vue b/src/views/mp/components/wx-news/main.vue
index 154291b3d..53b99bb18 100644
--- a/src/views/mp/components/wx-news/main.vue
+++ b/src/views/mp/components/wx-news/main.vue
@@ -13,7 +13,7 @@
         <div class="news-main">
           <div class="news-content">
             <el-image
-              :src="article.picUrl"
+                :src="article.picUrl||article.thumbUrl"
               class="material-img"
               style="width: 100%; height: 120px"
             />
@@ -29,7 +29,7 @@
           <div class="news-content-item">
             <div class="news-content-item-title">{{ article.title }}</div>
             <div class="news-content-item-img">
-              <img :src="article.picUrl" class="material-img" height="100%" />
+              <img :src="article.picUrl||article.thumbUrl" class="material-img" height="100%"/>
             </div>
           </div>
         </div>
diff --git a/src/views/mp/message/MessageTable.vue b/src/views/mp/message/MessageTable.vue
index ebc3d749e..2c925890e 100644
--- a/src/views/mp/message/MessageTable.vue
+++ b/src/views/mp/message/MessageTable.vue
@@ -59,6 +59,9 @@
           >
             <el-tag>选择地理位置</el-tag>
           </div>
+          <div v-else-if="scope.row.type === MsgType.Event && scope.row.event === 'SCAN'">
+            <el-tag type="success">扫码</el-tag>
+          </div>
           <div v-else-if="scope.row.type === MsgType.Event">
             <el-tag type="danger">未知事件类型</el-tag>
           </div>
@@ -127,8 +130,8 @@ import WxVoicePlayer from '@/views/mp/components/wx-voice-play'
 import WxLocation from '@/views/mp/components/wx-location'
 import WxMusic from '@/views/mp/components/wx-music'
 import WxNews from '@/views/mp/components/wx-news'
-import { dateFormatter } from '@/utils/formatTime'
-import { MsgType } from '@/views/mp/components/wx-msg/types'
+import {dateFormatter} from '@/utils/formatTime'
+import {MsgType} from '@/views/mp/components/wx-msg/types'
 
 const props = defineProps({
   list: {
diff --git a/src/views/mp/user/index.vue b/src/views/mp/user/index.vue
index 6147351aa..be71811b1 100644
--- a/src/views/mp/user/index.vue
+++ b/src/views/mp/user/index.vue
@@ -52,6 +52,11 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="用户标识" align="center" prop="openid" width="260" />
+      <el-table-column label="用户头像" min-width="80px" prop="headImageUrl">
+        <template #default="scope">
+          <el-avatar :src="scope.row.headImageUrl"/>
+        </template>
+      </el-table-column>
       <el-table-column label="昵称" align="center" prop="nickname" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="标签" align="center" prop="tagIds" width="200">
@@ -100,11 +105,11 @@
   <UserForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" setup>
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter} from '@/utils/formatTime'
 import * as MpUserApi from '@/api/mp/user'
 import * as MpTagApi from '@/api/mp/tag'
 import WxAccountSelect from '@/views/mp/components/wx-account-select'
-import type { FormInstance } from 'element-plus'
+import type {FormInstance} from 'element-plus'
 import UserForm from './UserForm.vue'
 
 defineOptions({ name: 'MpUser' })
-- 
Gitee


From 9bff754127d4d3d03ef12a44d740c76458b63f35 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Tue, 29 Jul 2025 10:30:34 +0800
Subject: [PATCH 2/2] Revert "/mp/open/ -> /admin-api/mp/open/" This reverts
 commit 8eee46d8

---
 src/views/mp/account/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mp/account/index.vue b/src/views/mp/account/index.vue
index 200a1e2ea..655170702 100644
--- a/src/views/mp/account/index.vue
+++ b/src/views/mp/account/index.vue
@@ -37,7 +37,7 @@
       <el-table-column label="appId" align="center" prop="appId" width="180" />
       <el-table-column label="服务器地址(URL)" align="center" prop="appId" width="360">
         <template #default="scope">
-          {{ `${serverUrl}/admin-api/mp/open/${scope.row.appId}` }}
+          {{ 'http://服务端地址/admin-api/mp/open/' + scope.row.appId }}
         </template>
       </el-table-column>
       <el-table-column label="二维码" align="center" prop="qrCodeUrl">
@@ -120,7 +120,7 @@ const queryParams = reactive({
   appId: null
 })
 const queryFormRef = ref() // 搜索的表单
-const serverUrl = import.meta.env.VITE_BASE_URL
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
-- 
Gitee