From e0305ab4968d4c14450180317e4d32f9e7f818f0 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Wed, 2 Apr 2025 13:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=E5=AE=89?=
 =?UTF-8?q?=E5=8D=93=E6=9C=BA=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A4=84=E7=90=86=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E5=8F=91=E9=80=81=E9=80=89=E6=8B=A9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93=E4=B8=8D=E8=83=BD=E5=8F=91=E9=80=81=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dialog/components/emojiPanel.vue | 29 ++++++++++++----------
 src/pages/dialog/components/filePanel.vue  |  3 +++
 src/store/modules/talk.js                  | 18 ++++++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/pages/dialog/components/emojiPanel.vue b/src/pages/dialog/components/emojiPanel.vue
index 7781977..e876c9f 100644
--- a/src/pages/dialog/components/emojiPanel.vue
+++ b/src/pages/dialog/components/emojiPanel.vue
@@ -1,25 +1,34 @@
 <template>
-  <div class="emojiRoot">
-    <div v-for="(img, key) in emojis" v-html="img" :key="key" @click="onSendEmoticon(1, key, img)"
-      class="option pointer flex-center" />
+  <div>
+    <zPaging :fixed="false" :height="'210px'" :show-scrollbar="false">
+      <div class="emojiRoot">
+        <div
+          v-for="(img, key) in emojis"
+          v-html="img"
+          :key="key"
+          @click="onSendEmoticon(1, key, img)"
+          class="option pointer flex-center"
+        />
+      </div>
+    </zPaging>
   </div>
 </template>
 <script setup>
-import { ref, reactive, defineProps,defineEmits } from "vue"
-import dayjs from "dayjs";
+import zPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+import { ref, reactive, defineProps, defineEmits } from 'vue'
+import dayjs from 'dayjs'
 import { beautifyTime } from '@/utils/datetime'
 import { useTalkStore } from '@/store'
 import { useSessionMenu } from '@/hooks'
 import { emojis } from '@/utils/emojis'
 
-
 const props = defineProps({
   data: {
     type: Object,
     default: {},
     required: false,
   },
-});
+})
 
 const emit = defineEmits(['on-select'])
 const onSendEmoticon = (type, value, img = '') => {
@@ -33,21 +42,15 @@ const onSendEmoticon = (type, value, img = '') => {
     emit('on-select', { type, value, img })
   }
 }
-
-
-
-
 </script>
 <style lang="scss" scoped>
 .emojiRoot {
   width: 100%;
-  height: 420rpx;
   padding: 5rpx 32rpx;
   display: flex;
   justify-content: flex-start;
   align-items: center;
   flex-wrap: wrap;
-  overflow: auto;
 }
 
 .option {
diff --git a/src/pages/dialog/components/filePanel.vue b/src/pages/dialog/components/filePanel.vue
index 3c61c0f..faab8ed 100644
--- a/src/pages/dialog/components/filePanel.vue
+++ b/src/pages/dialog/components/filePanel.vue
@@ -376,6 +376,9 @@ const onUploadImageVideo = async (file, type = 'image', fileUrl) => {
 }
 
 const base64ToFile = (base64) => {
+  if (!base64) {
+    message.warning('您的系统暂不支持发送原图哦')
+  }
   // base64转file
   const [header, base64String] = base64.split(';base64,')
   const imageType = header.split(':')[1]
diff --git a/src/store/modules/talk.js b/src/store/modules/talk.js
index 380a45f..cdf74ba 100644
--- a/src/store/modules/talk.js
+++ b/src/store/modules/talk.js
@@ -102,6 +102,24 @@ export const useTalkStore = defineStore('talk', {
       // 返回 Promise 对象，使调用方可以使用 then/catch
       return resp.then(({ code, data }) => {
         if (code == 200) {
+          //向OA的webview通信，改变未读消息数量
+          if (typeof plus !== 'undefined') {
+            let OAWebView = plus.webview.all()
+            OAWebView.forEach((webview) => {
+              if (webview.id === 'webviewId1') {
+                webview.evalJS(`doUpdateUnreadNum('${data.unread_num}')`)
+              }
+            })
+          } else {
+            document.addEventListener('plusready', () => {
+              let OAWebView = plus.webview.all()
+              OAWebView.forEach((webview) => {
+                if (webview.id === 'webviewId1') {
+                  webview.evalJS(`doUpdateUnreadNum('${data.unread_num}')`)
+                }
+              })
+            })
+          }
           this.items = data.items.map((item) => {
             const value = formatTalkItem(item)