Merge pull request #107 from kniglt12/main

feat :sms

Author: lyx1213812138

src/api/sms/index.ts

@@ -2,8 +2,9 @@ import { SmsRequest, SmsResponse } from '@/constants/httpMsg/sms/sendSmsMsg';
 import request from '../_request';
 
 export default async function sendSms(data: SmsRequest): Promise<SmsResponse> {
+  const url = 'aids' in data ? '/sms/' : '/sms/raw';
   const res: SmsResponse = await request({
-    url: '/sms/raw',
+    url,
     method: 'POST',
     data,
   });

src/constants/httpMsg/sms/sendSmsMsg.ts

@@ -1,8 +1,20 @@
+import { Step } from '@/constants/team';
 import { HttpRes } from '../_httpResTemplate';
 
-export interface SmsRequest {
-  aid: string;
-  content: string;
-}
+export type SmsRequest =
+  | {
+      type?: 'Accept' | 'Reject';
+      current?: Step;
+      next?: Step;
+      time?: string;
+      place?: string;
+      meeting_id?: string;
+      rest?: string;
+      aids: string[];
+    }
+  | {
+      aid: string;
+      content: string;
+    };
 
 export type SmsResponse = HttpRes<object>;

src/constants/team.ts

@@ -142,10 +142,16 @@ export const SMSTemplate: {
   },
   {
     i18nKey: 'sms.base',
-    match: [Step.WrittenTest, Step.StressTest],
+    match: [Step.StressTest],
     restI18nKey: 'sms.rest.test',
     required: ['time', 'place', 'next'],
   },
+  {
+    i18nKey: 'sms.base',
+    match: [Step.WrittenTest],
+    restI18nKey: 'sms.rest.writtenTest',
+    required: ['time', 'next'],
+  },
   {
     i18nKey: 'sms.base',
     match: [Step.GroupTimeSelection, Step.TeamTimeSelection],

src/locale/zh-CN/sms.ts

@@ -2,12 +2,14 @@ export default {
   'sms.interview':
     '{name}你好，请于{example_time}在启明学院亮胜楼{place}参加{next}，请准时到场。',
   'sms.onlineInterview':
-    '{name}你好，欢迎参加{recruitment_name} {group}组{online_interview_type}，面试将于{example_time}进行，请在PC端点击腾讯会议参加面试，会议号{meeting_id}，并提前调试好摄像头和麦克风，祝你面试顺利.',
+    '{name}你好，欢迎参加{recruitment_name} {group}组{online_interview_type}，面试将于{example_time}进行，请在PC端点击腾讯会议参加面试，会议号{meeting_id}，并提前调试好摄像头和麦克风，祝你面试顺利。',
   'sms.base':
     '{name}你好，你通过了{recruitment_name} {group}组{current}审核，{rest}',
   'sms.rest.test': '请于{time}在{place}参加{next}，请务必准时到场',
-  'sms.rest.timeSelection': '请进入选手dashboard系统选择面试时间',
-  'sms.rest.pass': '你已成功加入{group}组',
+  'sms.rest.writtenTest':
+    '请进入报名系统获取笔试题，并及时完成笔试。笔试的截止时间是{time}，请务必及时将答案发送至招新平台，超时视为弃权，若有特殊情况导致无法准时完成笔试题或者放弃作答请及时联系招新群{group}组管理员。',
+  'sms.rest.timeSelection': '请进入报名系统选择面试时间。',
+  'sms.rest.pass': '你已成功加入{group}组。',
   'sms.reject':
     '{name}你好，你没有通过{recruitment_name} {group}组{current}审核，请你{rest}不要灰心，继续学习。期待与更强大的你的相遇！',
 };

src/views/components/notification-modal.vue

@@ -154,6 +154,7 @@
 import { ref, PropType, watch, computed } from 'vue';
 import { Group, recruitSteps, Step, SMSTemplate } from '@/constants/team';
 import { sendSms } from '@/api';
+import { groupBy } from 'lodash';
 import { Message } from '@arco-design/web-vue';
 import { useI18n } from 'vue-i18n';
 import dayjs from 'dayjs';
@@ -334,20 +335,30 @@ const handleNotify = async () => {
       Message.error(t('candidate.requireAllocateTime'));
       return false;
     }
-  }
 
-  const reqs = props.candidates.map((candidate) => {
-    const content = isCustom.value
-      ? customContents.value[candidate.aid]
-      : generateSMSContent(candidate);
-    return sendSms({
-      aid: candidate.aid,
-      content,
+    const res = groupBy(props.candidates, ({ step }) => step);
+    const reqs = Object.entries(res).map(([current, arr]) => {
+      const aids = arr.map(({ aid }) => aid);
+      return sendSms({
+        type: props.type,
+        current: current as Step,
+        ...formData.value,
+        aids,
+      });
     });
-  });
+    const resp = await Promise.all(reqs);
+    if (!resp.every((x) => x)) return false;
+  } else {
+    const reqs = props.candidates.map((candidate) => {
+      return sendSms({
+        aid: candidate.aid,
+        content: customContents.value[candidate.aid],
+      });
+    });
+    const resp = await Promise.all(reqs);
+    if (!resp.every((x) => x)) return false;
+  }
 
-  const resp = await Promise.all(reqs);
-  if (!resp.every((x) => x)) return false;
   Message.success(t('common.result.sendSuccess'));
   notifyFormRef.value?.resetFields();
   [formData.value.next] = nextValidSteps.value;

src/views/overview/candidate/components/candidate-info.vue

@@ -392,10 +392,6 @@ const handleSetStressTime = async (): Promise<boolean> => {
   Message.success(t('common.result.setStressTestTimeSuccess'));
   return true;
 };
-
-// 预览链接
-// const preUrl =
-//   'blob:http://localhost:5111/33cb0d31-e85c-4d11-90df-70328f58f268';
 </script>
 
 <style scoped lang="less">

src/views/overview/detail/profile.vue

@@ -23,7 +23,7 @@
           }}</span>
         </div>
         <div class="sm:hidden flex items-center">
-          <icon-qq />
+          <icon-qq class="arco-icon" />
           <span class="ml-2.5 w-52 overflow-x-auto">{{
             user?.qq_account ?? ''
           }}</span>
@@ -68,7 +68,7 @@
         <div
           class="w-9 h-9 rounded-full flex justify-center items-center bg-[rgb(var(--gray-2))] shrink-0"
         >
-          <icon-qq :size="20" width="20" height="20" />
+          <icon-qq class="arco-icon" size="20" />
         </div>
         <div>
           <div class="text-[--color-text-3]">