From 4bcaf14bad1f8566650c5d9304093354b8595ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com> Date: Wed, 22 Jul 2026 13:36:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(im):=20=E8=BF=81=E7=A7=BB=20Element=20U?= =?UTF-8?q?I=20=E5=9B=BE=E6=A0=87=E5=B9=B6=E4=BF=AE=E5=A4=8D=20Vue=203=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=20-=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20migrate-legacy-icons=20=E8=84=9A=E6=9C=AC=EF=BC=8C=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=B0=86=E6=97=A7=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=20legacy-el-icon=20=E7=BB=84=E4=BB=B6=20-=20=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E4=B8=AD=E5=B0=86=20=20=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=20=20-=20=E5=B0=86=20size=3D"mini"/"med?= =?UTF-8?q?ium"=20=E8=B0=83=E6=95=B4=E4=B8=BA=20Element=20Plus=20=E7=9A=84?= =?UTF-8?q?=20small/default=20-=20=E6=96=B0=E5=A2=9E=20legacy-el-icon=20?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BB=84=E4=BB=B6=E5=8F=8A=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im/scripts/migrate-legacy-icons.js | 81 ++++++++++++++++ im/src/assets/images.js | 5 + im/src/components/chat/TalkCodeBlock.vue | 4 +- im/src/components/chat/TalkForwardRecord.vue | 2 +- im/src/components/chat/TalkSearchRecord.vue | 8 +- .../components/chat/messaege/AudioMessage.vue | 8 +- .../components/chat/messaege/CodeMessage.vue | 10 +- .../chat/messaege/VisitCardMessage.vue | 2 +- .../components/chat/messaege/VoteMessage.vue | 9 +- im/src/components/chat/panel/PanelHeader.vue | 4 +- im/src/components/chat/panel/PanelToolbar.vue | 8 +- im/src/components/chat/panel/TalkPanel.vue | 13 ++- .../chat/panel/template/footPrint.vue | 20 ++-- .../chat/panel/template/goodsLink.vue | 2 +- .../chat/panel/template/storeDetail.vue | 4 +- im/src/components/editor/MeEditor.vue | 10 +- im/src/components/editor/MeEditorEmoticon.vue | 6 +- .../components/editor/MeEditorFileManage.vue | 2 +- .../components/editor/MeEditorImageView.vue | 4 +- im/src/components/editor/MeEditorRecorder.vue | 36 +++---- .../editor/MeEditorSystemEmoticon.vue | 4 +- im/src/components/editor/MeEditorVote.vue | 10 +- im/src/components/global/Empty.vue | 4 +- im/src/components/global/LegacyElIcon.vue | 25 +++++ im/src/components/layout/AbsModule.vue | 2 +- im/src/components/layout/AvatarCropper.vue | 10 +- im/src/components/layout/RewardModule.vue | 2 +- .../components/notify/FriendApplyNotify.vue | 2 +- im/src/components/notify/NewMessageNotify.vue | 4 +- im/src/components/user/UserSearch.vue | 4 +- .../user/user-card/UserCardDetail.vue | 15 +-- im/src/components/user/user-card/index.js | 4 + im/src/core/global-component.js | 4 + im/src/core/legacy-icon-map.js | 96 +++++++++++++++++++ im/src/plugins/contextmenu.js | 3 +- im/src/store/modules/user.js | 5 +- im/src/store/state.js | 2 +- im/src/views/layout/MainLayout.vue | 2 +- im/src/views/message/index.vue | 8 +- 39 files changed, 329 insertions(+), 115 deletions(-) create mode 100644 im/scripts/migrate-legacy-icons.js create mode 100644 im/src/assets/images.js create mode 100644 im/src/components/global/LegacyElIcon.vue create mode 100644 im/src/core/legacy-icon-map.js diff --git a/im/scripts/migrate-legacy-icons.js b/im/scripts/migrate-legacy-icons.js new file mode 100644 index 00000000..cdb2cd18 --- /dev/null +++ b/im/scripts/migrate-legacy-icons.js @@ -0,0 +1,81 @@ +const fs = require("fs"); +const path = require("path"); + +const root = path.join(__dirname, "../src"); + +const pairs = [ + [/<\/i>/g, ''], + [/ 加好友/g, ' 加好友'], + [/<\/i> 添加选项/g, ' 添加选项'], + [ + /<\/i>/g, + '', + ], + [ + //g, + '', + ], + [/icon="el-icon-microphone"/g, ":icon=\"$legacyIcon('el-icon-microphone')\""], + [/icon="el-icon-video-pause"/g, ":icon=\"$legacyIcon('el-icon-video-pause')\""], + [/icon="el-icon-video-play"/g, ":icon=\"$legacyIcon('el-icon-video-play')\""], + [/icon="el-icon-upload"/g, ":icon=\"$legacyIcon('el-icon-upload')\""], + [/icon="el-icon-refresh"/g, ":icon=\"$legacyIcon('el-icon-refresh')\""], + [/icon="el-icon-refresh-left"/g, ":icon=\"$legacyIcon('el-icon-refresh-left')\""], + [/icon="el-icon-refresh-right"/g, ":icon=\"$legacyIcon('el-icon-refresh-right')\""], + [/prefix-icon="el-icon-search"/g, ":prefix-icon=\"$legacyIcon('el-icon-search')\""], + [/size="mini"/g, 'size="small"'], + [/size='mini'/g, "size='small'"], + [/size="medium"/g, 'size="default"'], +]; + +function walk(dir, files = []) { + for (const entry of fs.readdirSync(dir, { withFileTypes: true })) { + const full = path.join(dir, entry.name); + if (entry.isDirectory()) walk(full, files); + else if (full.endsWith(".vue")) files.push(full); + } + return files; +} + +let changed = 0; +for (const file of walk(root)) { + let content = fs.readFileSync(file, "utf8"); + let next = content; + for (const [pattern, replacement] of pairs) { + next = next.replace(pattern, replacement); + } + if (next !== content) { + fs.writeFileSync(file, next); + console.log("updated:", path.relative(root, file)); + changed++; + } +} + +console.log("files changed:", changed); diff --git a/im/src/assets/images.js b/im/src/assets/images.js new file mode 100644 index 00000000..8c91c201 --- /dev/null +++ b/im/src/assets/images.js @@ -0,0 +1,5 @@ +import defaultAvatar from "@/assets/image/detault-avatar.jpg"; +import defaultUserBanner from "@/assets/image/default-user-banner.png"; +import noOncallImage from "@/assets/image/no-oncall.6b776fcf.png"; + +export { defaultAvatar, defaultUserBanner, noOncallImage }; diff --git a/im/src/components/chat/TalkCodeBlock.vue b/im/src/components/chat/TalkCodeBlock.vue index 3bbfc9f5..44b73b44 100644 --- a/im/src/components/chat/TalkCodeBlock.vue +++ b/im/src/components/chat/TalkCodeBlock.vue @@ -5,11 +5,11 @@
选择编程语言:   - +
- +

会话记录 ({{ records.length }})

- +

diff --git a/im/src/components/chat/TalkSearchRecord.vue b/im/src/components/chat/TalkSearchRecord.vue index 0f4764af..27197b21 100644 --- a/im/src/components/chat/TalkSearchRecord.vue +++ b/im/src/components/chat/TalkSearchRecord.vue @@ -13,7 +13,7 @@ :class="fullscreen ? 'icon-tuichuquanping' : 'icon-quanping'" @click="fullscreen = !fullscreen" /> - +

@@ -24,7 +24,7 @@ @click="triggerBroadside" />
- +
- + 加载数据中...
- + 加载更多...
diff --git a/im/src/components/chat/messaege/AudioMessage.vue b/im/src/components/chat/messaege/AudioMessage.vue index 04153ad9..26527129 100644 --- a/im/src/components/chat/messaege/AudioMessage.vue +++ b/im/src/components/chat/messaege/AudioMessage.vue @@ -2,9 +2,9 @@
- - - + + +

合并转发

- +

逐条转发

- +

批量删除

- +

关闭

diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue index c44f409d..f0328d34 100644 --- a/im/src/components/chat/panel/TalkPanel.vue +++ b/im/src/components/chat/panel/TalkPanel.vue @@ -9,10 +9,10 @@
- 正在加载数据中... + 正在加载数据中... - 查看更多消息... + 查看更多消息... 没有更多消息了...
@@ -39,8 +39,7 @@ 'checkbox-border': multiSelect.isOpen === true, }">
diff --git a/im/src/components/global/Empty.vue b/im/src/components/global/Empty.vue index a4cb33a6..5cd5ba4d 100644 --- a/im/src/components/global/Empty.vue +++ b/im/src/components/global/Empty.vue @@ -8,6 +8,8 @@ diff --git a/im/src/components/layout/AbsModule.vue b/im/src/components/layout/AbsModule.vue index 7768db15..e74552b8 100644 --- a/im/src/components/layout/AbsModule.vue +++ b/im/src/components/layout/AbsModule.vue @@ -2,7 +2,7 @@
- + diff --git a/im/src/components/layout/AvatarCropper.vue b/im/src/components/layout/AvatarCropper.vue index 0f9883f4..98e111c0 100644 --- a/im/src/components/layout/AvatarCropper.vue +++ b/im/src/components/layout/AvatarCropper.vue @@ -4,7 +4,7 @@

选择头像

- +

@@ -45,28 +45,28 @@ 上传图片 刷新 左转 右转 diff --git a/im/src/components/layout/RewardModule.vue b/im/src/components/layout/RewardModule.vue index 6fdff64d..0e2b6ba5 100644 --- a/im/src/components/layout/RewardModule.vue +++ b/im/src/components/layout/RewardModule.vue @@ -3,7 +3,7 @@
Donate - +
diff --git a/im/src/components/notify/FriendApplyNotify.vue b/im/src/components/notify/FriendApplyNotify.vue index db61840e..300e7f8e 100644 --- a/im/src/components/notify/FriendApplyNotify.vue +++ b/im/src/components/notify/FriendApplyNotify.vue @@ -2,7 +2,7 @@
- +
diff --git a/im/src/components/notify/NewMessageNotify.vue b/im/src/components/notify/NewMessageNotify.vue index 29eade88..adcbab15 100644 --- a/im/src/components/notify/NewMessageNotify.vue +++ b/im/src/components/notify/NewMessageNotify.vue @@ -2,14 +2,14 @@
- +

{{ talk_type == 1 ? '私信消息通知' : '群聊消息通知' }}

-

{{ formatTime(datetime) }}

+

{{ formatTime(datetime) }}

@{{ nickname }}

diff --git a/im/src/components/user/UserSearch.vue b/im/src/components/user/UserSearch.vue index 35fba1b0..896de74b 100644 --- a/im/src/components/user/UserSearch.vue +++ b/im/src/components/user/UserSearch.vue @@ -5,7 +5,7 @@

添加好友

- +

@@ -13,7 +13,7 @@ v-model="mobile" id="serach-mobile" class="input" - prefix-icon="el-icon-search" + :prefix-icon="$legacyIcon('el-icon-search')" placeholder="请输入对方手机号(精确查找)" clearable @keyup.enter="onSubmit" diff --git a/im/src/components/user/user-card/UserCardDetail.vue b/im/src/components/user/user-card/UserCardDetail.vue index afa67f5a..d96a0ece 100644 --- a/im/src/components/user/user-card/UserCardDetail.vue +++ b/im/src/components/user/user-card/UserCardDetail.vue @@ -2,7 +2,7 @@
- +
@@ -55,9 +55,9 @@ @keyup.enter="editRemarkSubmit" /> -
@@ -76,7 +76,7 @@ v-if="detail.friend_status == 1 && detail.friend_apply == 0" type="primary" size="small" - icon="el-icon-circle-plus-outline" + :icon="$legacyIcon('el-icon-circle-plus-outline')" @click="apply.isShow = true" >添加好友 @@ -90,7 +90,7 @@ v-else-if="detail.friend_status == 2" type="primary" size="small" - icon="el-icon-s-promotion" + :icon="$legacyIcon('el-icon-s-promotion')" @click="sendMessage(detail)" >发消息 @@ -125,6 +125,7 @@ // import { ServeSearchUser } from "@/api/user"; import { ServeCreateContact, ServeEditContactRemark } from "@/api/contacts"; import { toTalk } from "@/utils/talk"; +import { defaultUserBanner } from "@/assets/images"; export default { name: "UserCardDetail", @@ -144,7 +145,7 @@ export default { friend_status: 0, friend_apply: 0, nickname_remark: "", - bag: require("@/assets/image/default-user-banner.png"), + bag: defaultUserBanner, gender: 0, }, @@ -425,7 +426,7 @@ export default { padding-right: 5px; } - .el-icon-edit-outline { + .legacy-el-icon { margin-left: 3px !important; } } diff --git a/im/src/components/user/user-card/index.js b/im/src/components/user/user-card/index.js index 347b0dd1..2e4aaafb 100644 --- a/im/src/components/user/user-card/index.js +++ b/im/src/components/user/user-card/index.js @@ -5,6 +5,8 @@ import store from "@/store"; import { setupElementPlus } from "@/plugins/element"; import { setupLegacyMessage } from "@/utils/message"; import { registerDirectives } from "@/core/directives"; +import LegacyElIcon from "@/components/global/LegacyElIcon.vue"; +import { resolveLegacyIcon } from "@/core/legacy-icon-map"; export default { install(app) { @@ -30,6 +32,8 @@ export default { setupElementPlus(cardApp); setupLegacyMessage(cardApp); registerDirectives(cardApp); + cardApp.component("legacy-el-icon", LegacyElIcon); + cardApp.config.globalProperties.$legacyIcon = resolveLegacyIcon; cardApp.use(router); cardApp.use(store); cardApp.mount(container); diff --git a/im/src/core/global-component.js b/im/src/core/global-component.js index 11cf62a2..954cdb8d 100644 --- a/im/src/core/global-component.js +++ b/im/src/core/global-component.js @@ -16,6 +16,8 @@ import { LoginMessage, } from "@/components/chat/messaege"; import UserCard from "@/components/user/user-card/index"; +import LegacyElIcon from "@/components/global/LegacyElIcon.vue"; +import { resolveLegacyIcon } from "@/core/legacy-icon-map"; const messageComponents = [ AudioMessage, @@ -39,5 +41,7 @@ export function registerGlobalComponents(app) { messageComponents.forEach((component) => { app.component(component.name, component); }); + app.component("legacy-el-icon", LegacyElIcon); + app.config.globalProperties.$legacyIcon = resolveLegacyIcon; app.use(UserCard); } diff --git a/im/src/core/legacy-icon-map.js b/im/src/core/legacy-icon-map.js new file mode 100644 index 00000000..aef338cb --- /dev/null +++ b/im/src/core/legacy-icon-map.js @@ -0,0 +1,96 @@ +import { + ArrowDown, + ArrowLeft, + ArrowRight, + Bell, + Bottom, + ChatDotRound, + ChatLineRound, + CircleCheck, + CircleClose, + CircleCloseFilled, + CirclePlus, + Clock, + Close, + Connection, + DataLine, + Delete, + DocumentCopy, + Edit, + Flag, + Folder, + FolderOpened, + Headset, + Loading, + Microphone, + MuteNotification, + Picture, + PictureRounded, + Plus, + Promotion, + Refresh, + RefreshLeft, + RefreshRight, + Remove, + Search, + Select, + Service, + Setting, + Top, + Upload, + User, + VideoPause, + VideoPlay, +} from "@element-plus/icons-vue"; + +/** Element UI `el-icon-*` class names → Element Plus icon components */ +export const LEGACY_ICON_MAP = { + "el-icon-arrow-down": ArrowDown, + "el-icon-bell": Bell, + "el-icon-bottom": Bottom, + "el-icon-caret-left": ArrowLeft, + "el-icon-caret-right": ArrowRight, + "el-icon-chat-dot-round": ChatDotRound, + "el-icon-chat-line-round": ChatLineRound, + "el-icon-circle-close": CircleClose, + "el-icon-circle-plus-outline": CirclePlus, + "el-icon-close": Close, + "el-icon-close-notification": MuteNotification, + "el-icon-connection": Connection, + "el-icon-delete": Delete, + "el-icon-document-copy": DocumentCopy, + "el-icon-edit-outline": Edit, + "el-icon-error": CircleCloseFilled, + "el-icon-finished": Select, + "el-icon-folder": Folder, + "el-icon-folder-opened": FolderOpened, + "el-icon-headset": Headset, + "el-icon-loading": Loading, + "el-icon-microphone": Microphone, + "el-icon-picture": Picture, + "el-icon-picture-outline-round": PictureRounded, + "el-icon-plus": Plus, + "el-icon-position": Promotion, + "el-icon-refresh": Refresh, + "el-icon-refresh-left": RefreshLeft, + "el-icon-refresh-right": RefreshRight, + "el-icon-remove-outline": Remove, + "el-icon-s-data": DataLine, + "el-icon-s-flag": Flag, + "el-icon-s-promotion": Promotion, + "el-icon-search": Search, + "el-icon-service": Service, + "el-icon-setting": Setting, + "el-icon-success": CircleCheck, + "el-icon-time": Clock, + "el-icon-top": Top, + "el-icon-upload": Upload, + "el-icon-user": User, + "el-icon-video-pause": VideoPause, + "el-icon-video-play": VideoPlay, +}; + +export function resolveLegacyIcon(name) { + if (!name) return null; + return LEGACY_ICON_MAP[name] || null; +} diff --git a/im/src/plugins/contextmenu.js b/im/src/plugins/contextmenu.js index 22f823cf..a676cb29 100644 --- a/im/src/plugins/contextmenu.js +++ b/im/src/plugins/contextmenu.js @@ -1,4 +1,5 @@ import { createApp, h, onMounted, onUnmounted } from "vue"; +import LegacyElIcon from "@/components/global/LegacyElIcon.vue"; let activeMenu = null; @@ -99,7 +100,7 @@ function renderMenuItem(item, close) { }, }, [ - item.icon ? h("i", { class: item.icon }) : null, + item.icon ? h(LegacyElIcon, { name: item.icon }) : null, h("span", item.label), ] ); diff --git a/im/src/store/modules/user.js b/im/src/store/modules/user.js index 507a2f96..cb419250 100644 --- a/im/src/store/modules/user.js +++ b/im/src/store/modules/user.js @@ -1,4 +1,5 @@ import { setUserInfo, getUserInfo, getToken } from "@/utils/auth"; +import { defaultAvatar, defaultUserBanner } from "@/assets/images"; // import { ServeLogout } from "@/api/user"; @@ -8,9 +9,9 @@ let state = { // 用户昵称 name: "", // 个性头像 - face: require("@/assets/image/detault-avatar.jpg"), + face: defaultAvatar, // 名片背景 - visitCardBag: require("@/assets/image/default-user-banner.png"), + visitCardBag: defaultUserBanner, // 当前登录状态 loginStatus: false, toUser:"" diff --git a/im/src/store/state.js b/im/src/store/state.js index 64c8f811..7538d278 100644 --- a/im/src/store/state.js +++ b/im/src/store/state.js @@ -1,4 +1,4 @@ -const defaultAvatar = require('@/assets/image/detault-avatar.jpg') +import { defaultAvatar } from "@/assets/images"; // 根级别的 state const state = { diff --git a/im/src/views/layout/MainLayout.vue b/im/src/views/layout/MainLayout.vue index 22fd0f67..f582d434 100644 --- a/im/src/views/layout/MainLayout.vue +++ b/im/src/views/layout/MainLayout.vue @@ -18,7 +18,7 @@
- +
diff --git a/im/src/views/message/index.vue b/im/src/views/message/index.vue index 5bc39888..682745ad 100644 --- a/im/src/views/message/index.vue +++ b/im/src/views/message/index.vue @@ -20,7 +20,7 @@
- +

@@ -78,7 +78,7 @@
- +
From c0ca9672a194255f4c7d24c3dc10f3af69713111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com> Date: Wed, 22 Jul 2026 18:08:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(buyer):=20=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=20-=20=E5=B0=86=E7=99=BB=E5=BD=95=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=94=B1=20Message=20=E6=94=B9=E4=B8=BA=20Modal=20-?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20promptLogin=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=20-=20IM?= =?UTF-8?q?Service=20=E5=A2=9E=E5=8A=A0=20accessToken=20=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=20-=20=E6=94=B9=E8=BF=9B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=A4=84=E7=90=86=20-=20=E9=87=8D=E6=9E=84=20IM=20=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=20URL=20=E6=8B=BC=E6=8E=A5=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/mixes/talkIm.vue | 60 ++-- buyer/src/pages/Cart.vue | 2 +- .../src/pages/home/memberCenter/Favorites.vue | 2 +- .../src/pages/home/orderCenter/AfterSale.vue | 2 +- buyer/src/pages/home/orderCenter/MyOrder.vue | 2 +- .../pages/home/orderCenter/OrderDetail.vue | 2 +- buyer/src/pages/home/userCenter/MyTracks.vue | 2 +- buyer/src/pages/payment/Pay.vue | 2 +- im/src/api/user.js | 28 +- im/src/components/chat/panel/OtherLink.vue | 300 +++++++++--------- im/src/components/chat/panel/TalkPanel.vue | 90 +++--- im/src/components/editor/MeEditor.vue | 6 +- im/src/main.js | 2 +- im/src/mixins/main-mixin.js | 23 +- im/src/utils/auth.js | 3 + im/src/utils/im-mode.js | 19 ++ im/src/utils/request.js | 5 +- im/src/utils/talk.js | 2 + im/src/views/message/index.vue | 54 ++-- 19 files changed, 343 insertions(+), 263 deletions(-) create mode 100644 im/src/utils/im-mode.js diff --git a/buyer/src/components/mixes/talkIm.vue b/buyer/src/components/mixes/talkIm.vue index 7087e688..f15a3939 100644 --- a/buyer/src/components/mixes/talkIm.vue +++ b/buyer/src/components/mixes/talkIm.vue @@ -3,7 +3,7 @@