From 8026b1991711b5ce8ea3f8b7dd635c7871791e23 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sat, 18 Nov 2023 12:04:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9E=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/Message/components/sendTest.vue  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/deliver-front/vue/src/views/Message/components/sendTest.vue b/deliver-front/vue/src/views/Message/components/sendTest.vue
index e183c1f6..780780ea 100644
--- a/deliver-front/vue/src/views/Message/components/sendTest.vue
+++ b/deliver-front/vue/src/views/Message/components/sendTest.vue
@@ -53,6 +53,7 @@ const showDrawer = (): void => {
 
 const onClose = (): void => {
   open.value = false
+  clearForm()
 }
 
 const addUserFlag = ref<boolean>(true)
@@ -69,7 +70,6 @@ const addUser = (): void => {
 }
 
 const deleteUserItem = (userItem): void => {
-  console.log(userItem)
   // 使用 splice 方法删除指定元素
   const indexToDelete = sendTestTable.users.indexOf(userItem)
   if (indexToDelete !== -1) {
@@ -90,27 +90,25 @@ const searchMes = (): void => {
     ?.validate()
     .then(() => {
       iconLoading.value = true
+      console.log(sendTestTable.users)
       sendTestMes(sendTestTable)
         .then(res => {
           if (res.code === 200) {
             void message.success('发送成功~ (*^▽^*)')
             onClose()
-          } else {
-            void message.error('发送失败，请检查网络~ (＞︿＜)')
           }
           showTime.value = true
           const setIntervals = setInterval(() => {
             timeOut.value = timeOut.value - 1
             if (timeOut.value === 0) {
-              iconLoading.value = false
               showTime.value = false
+              iconLoading.value = false
               clearInterval(setIntervals)
+              timeOut.value = 3
             }
           }, 1000)
         })
-        .catch(err => {
-          console.error('An error occurred:', err)
-        })
+        .catch(_ => {})
     })
     .catch(error => {
       console.log('error', error)
@@ -142,7 +140,7 @@ const rules: Record<string, Rule[]> = {
         </a-input-group>
       </a-form-item>
       <a-form-item label="用户列表" name="users">
-        <a-list size="small" bordered :data-source="sendTestTable.users">
+        <a-list size="small" bordered v-model:value="sendTestTable.users" :data-source="sendTestTable.users">
           <template #renderItem="{ item }">
             <a-list-item>
               {{ item }}
@@ -174,8 +172,8 @@ const rules: Record<string, Rule[]> = {
     <template #extra>
       <a-button style="margin: 0 8px" @click="clearForm">清空</a-button>
       <a-button type="primary" html-type="submit" @click="searchMes" :loading="iconLoading">
-        发送
-        <span v-if="showTime">{{ timeOut }}</span>
+        <template v-if="showTime">{{ timeOut }}s</template>
+        <template v-else>发送</template>
       </a-button>
     </template>
   </a-drawer>
-- 
Gitee


From 7dcdd860655c0f792e900f246fb31e71a6ea2b8a Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sat, 18 Nov 2023 15:37:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20message=E8=A1=A8=E6=A0=BC=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=98=A0=E5=B0=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/utils/date.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deliver-front/vue/src/utils/date.ts b/deliver-front/vue/src/utils/date.ts
index 6cbbb5c3..414f08e3 100644
--- a/deliver-front/vue/src/utils/date.ts
+++ b/deliver-front/vue/src/utils/date.ts
@@ -36,7 +36,7 @@ export const getChannelType = (s: string): number => {
 }
 
 export const getUsersType = (s: string): number => {
-  const usersarr = ['企业账号', '电话', '邮箱', '平台userId']
+  const usersarr = ['企业账号', '电话', '邮箱', '平台 UserId']
   return usersarr.indexOf(s)
 }
 
@@ -104,5 +104,8 @@ export const changeTable = (item): any => {
   // pushrange
   const pusharr = ['不限', '企业内部', '企业外部']
   item.pushRange = pusharr[item.pushRange]
+  // userstype
+  const userarr = ['', '企业账号', '电话', '邮箱', '平台 UserId']
+  item.usersType = userarr[Number(item.usersType)]
   return item
 }
-- 
Gitee


From 02c0e7d3fa4faa7ae34df758bf743f8aba747a38 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sat, 18 Nov 2023 16:02:56 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20message=E8=A1=A8=E6=A0=BC=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93=E9=80=89=E6=8B=A9=E6=98=A0=E5=B0=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/utils/date.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/deliver-front/vue/src/utils/date.ts b/deliver-front/vue/src/utils/date.ts
index 414f08e3..988da31b 100644
--- a/deliver-front/vue/src/utils/date.ts
+++ b/deliver-front/vue/src/utils/date.ts
@@ -101,11 +101,14 @@ export const changeTable = (item): any => {
   // eslint-disable-next-line
   item.templateStatus = item.templateStatus === 1 ? true : false
   item.key = item.templateId
-  // pushrange
-  const pusharr = ['不限', '企业内部', '企业外部']
-  item.pushRange = pusharr[item.pushRange]
-  // userstype
-  const userarr = ['', '企业账号', '电话', '邮箱', '平台 UserId']
-  item.usersType = userarr[Number(item.usersType)]
+  // pushRange
+  const pushArr = ['不限', '企业内部', '企业外部']
+  item.pushRange = pushArr[item.pushRange]
+  // usersType
+  const userArr = ['', '企业账号', '电话', '邮箱', '平台 UserId']
+  item.usersType = userArr[Number(item.usersType)]
+  // channelType
+  const channelArr = ['', '电话', '短信', '邮件', '钉钉', '企业微信', '飞书']
+  item.channelType = channelArr[item.channelType]
   return item
 }
-- 
Gitee


From 15048edee480251d87e952f86d42c94874d1780f Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sat, 18 Nov 2023 16:12:04 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20message=E8=A1=A8=E6=A0=BC=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B=E6=98=A0=E5=B0=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/utils/date.ts | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/deliver-front/vue/src/utils/date.ts b/deliver-front/vue/src/utils/date.ts
index 988da31b..92e07fb5 100644
--- a/deliver-front/vue/src/utils/date.ts
+++ b/deliver-front/vue/src/utils/date.ts
@@ -110,5 +110,37 @@ export const changeTable = (item): any => {
   // channelType
   const channelArr = ['', '电话', '短信', '邮件', '钉钉', '企业微信', '飞书']
   item.channelType = channelArr[item.channelType]
+  // messageType
+  const arr = [
+    { id: '1', name: 'text 消息' },
+    //
+    { id: '4-1', name: '钉钉图片消息' },
+    { id: '4-2', name: '钉钉语音消息' },
+    { id: '4-3', name: '钉钉文件消息' },
+    { id: '4-4', name: '钉钉链接消息' },
+    { id: '4-5', name: '钉钉 OA 消息' },
+    { id: '4-6', name: '钉钉 markdown 消息' },
+    { id: '4-7', name: '钉钉卡片消息' },
+    //
+    { id: '5-1', name: '企业微信图片消息' },
+    { id: '5-2', name: '企业微信语音消息' },
+    { id: '5-3', name: '企业微信视频消息' },
+    { id: '5-4', name: '企业微信文件消息' },
+    { id: '5-5', name: '企业微信文本卡片消息' },
+    { id: '5-6', name: '企业微信图文消息（mpnews）' },
+    { id: '5-7', name: '企业微信 markdown 消息' },
+    { id: '5-8', name: '企业微信小程序通知消息' },
+    //
+    { id: '6-1', name: '富文本 post' },
+    { id: '6-2', name: '图片 image' },
+    { id: '6-3', name: '消息卡片 interactive' },
+    { id: '6-4', name: '分享群名片 share_chat' },
+    { id: '6-5', name: '分享个人名片 share_user' },
+    { id: '6-6', name: '语音 audio' },
+    { id: '6-7', name: '视频 media' },
+    { id: '6-8', name: '文件 file' },
+    { id: '6-9', name: '表情包 sticker' }
+  ]
+  item.messageType = arr.find(it => it.id === item.messageType)?.name
   return item
 }
-- 
Gitee


From 7a96cd9660f97437c54c3884f7815c9f984c1835 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sat, 18 Nov 2023 16:17:43 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=EF=BC=88message=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/views/Message/index.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index a74d6f25..511d2905 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -10,7 +10,7 @@ import addTemplate from './components/addTemplate.vue'
 import modifyTemplate from './components/modifyTemplate.vue'
 import sendTest from './components/sendTest.vue'
 import { addTemplatePages, deleteTemplate, getTemplatePages, updateStatus } from '@/api/message'
-import { changeTable, getAllMessage, getDate } from '@/utils/date'
+import { changeTable, getAllMessage } from '@/utils/date'
 import { useStore } from '@/store'
 
 /**
@@ -308,14 +308,8 @@ const searchTemplate = ({ page, pageSize, opt }: SearchOptions = {}): void => {
       if (res.data.records.length > 0) {
         total.value = res.data.total
         res.data.records.forEach((item: any) => {
-          item.channelType = JSON.parse(item.pushWays).channelType
-          item.messageType = JSON.parse(item.pushWays).messageType
-          item.createTime = getDate(item.createTime)
-          // eslint-disable-next-line
-          item.templateStatus = item.templateStatus === 1 ? true : false
-          item.key = item.templateId
-          const i = item
-          templateTable.push(i)
+          item = changeTable(item)
+          templateTable.push(item)
         })
         if (opt === 1) {
           void message.success('查询成功~ (*^▽^*)')
-- 
Gitee