From 3c0faea3439d31e21631ea55e6a58559968cf739 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 29 Nov 2024 17:02:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 2 +- src/api/Home/Index/index.ts | 5 ++++ src/assets/icon55.png | Bin 0 -> 7356 bytes src/page/Home/Index/index.module.scss | 24 +++++++++++++---- src/page/Home/Index/index.tsx | 37 +++++++++++++++++++++++--- src/utils/package/imageUrl.ts | 6 ++++- 6 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 src/assets/icon55.png diff --git a/main.js b/main.js index 8ff0046..4b316bc 100644 --- a/main.js +++ b/main.js @@ -44,7 +44,7 @@ class AppWindow extends BrowserWindow { }; const finalConfig = { ...basicConfig, ...config }; super(finalConfig); - if (envStr === 'development') { + if (env === 'development') { // 开发 this.loadURL('http://localhost:3000'); } else { diff --git a/src/api/Home/Index/index.ts b/src/api/Home/Index/index.ts index bcb47e7..d18265e 100644 --- a/src/api/Home/Index/index.ts +++ b/src/api/Home/Index/index.ts @@ -46,6 +46,11 @@ export const GetAgoraConf = () => url: `/home/agora-conf`, method: 'get', }) +export const GetQrcode = (roomNum: string, env: string) => + request({ + url: `/home/r-qrcode?roomNum=${roomNum}&env=${env}`, + method: 'get', + }) export const GetRecord = (beginTimestamp: number, endTimestamp: number, roomNum: string) => request({ diff --git a/src/assets/icon55.png b/src/assets/icon55.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a302efd6e1ee87ee348219c2f049a9c9985df1 GIT binary patch literal 7356 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 literal 0 HcmV?d00001 diff --git a/src/page/Home/Index/index.module.scss b/src/page/Home/Index/index.module.scss index 0a634c8..f8603d3 100644 --- a/src/page/Home/Index/index.module.scss +++ b/src/page/Home/Index/index.module.scss @@ -108,12 +108,26 @@ >div:nth-child(1) { display: flex; align-items: center; - cursor: pointer; - >span { - color: #767676; - margin-right: 4px; - font-size: 14px; + >div:nth-child(1) { + margin-right: 6px; + display: flex; + align-items: center; + cursor: pointer; + + >span { + color: #767676; + margin-right: 6px; + font-size: 14px; + } + } + + >div:nth-child(2) { + cursor: pointer; + + >img { + width: 16px; + } } } diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 1a23802..257615a 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -2,7 +2,7 @@ import styles from '@/page/Home/Index/index.module.scss' import { useEffect, useState, useRef } from "react"; import Operation from '@/components/Operation'; import { Button, Input, Modal, Pagination, Empty, message, Popover, Popconfirm, DatePicker, Select } from "antd"; -import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo } from '@/api/Home/Index'; +import { GetRoom, PostRoom, GetCheckoutRoomNum, GetRoomRtcToken, DeleteRoom, GetRecord, PostRoomInfo, GetQrcode } from '@/api/Home/Index'; import ImageUrl from '@/utils/package/imageUrl' import { ExclamationCircleFilled, ReloadOutlined } from '@ant-design/icons'; import JoinSetting from '@/components/JoinSetting'; @@ -41,6 +41,7 @@ const Index: React.FC = () => { const [subjectList, setSubjectList] = useState([]); const [timeData, setTimeData] = useState([]); const [isCreateRoom, setIsCreateRoom] = useState(false); + const [baseImage, setBaseImage] = useState(''); const userInfo = JSON.parse(storage.getItem('user') as string) useEffect(() => { setUser(userInfo) @@ -231,9 +232,37 @@ const Index: React.FC = () => {
-
copyRoomNum(item.roomNum)} title='复制房间号'> - {item.roomNum} - +
+
copyRoomNum(item.roomNum)} title='复制房间号'> + {item.roomNum} + +
+ { + if (e) { + GetQrcode(item.roomNum, import.meta.env.VITE_ENV === 'development' ? 'trial' : 'release').then(res => { + if (res.code === 200) { + setBaseImage(res.data) + } + }) + } + }} + content={ +
+ +
+ 微信中长按图片识别小程序码
+ 加入会议 +
+
+ } + > +
+ +
+ +
{role.ID.includes(userInfo.roleId) ? Date: Fri, 29 Nov 2024 17:05:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Home/Index/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 257615a..71afbcb 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -250,8 +250,8 @@ const Index: React.FC = () => { }} content={
- -
+ +
微信中长按图片识别小程序码
加入会议
From a390572d99b0d5dde762b184be3a9458e004168c Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Tue, 3 Dec 2024 09:37:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E5=8A=A0=E8=BD=BD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Home/Index/index.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx index 71afbcb..bcb7926 100644 --- a/src/page/Home/Index/index.tsx +++ b/src/page/Home/Index/index.tsx @@ -240,6 +240,7 @@ const Index: React.FC = () => { { + setBaseImage('') if (e) { GetQrcode(item.roomNum, import.meta.env.VITE_ENV === 'development' ? 'trial' : 'release').then(res => { if (res.code === 200) { @@ -249,12 +250,14 @@ const Index: React.FC = () => { } }} content={ -
- + baseImage ?
+
微信中长按图片识别小程序码
加入会议
+
:
+
} >