From 400d00546d18732ff05ff1cb93d2d06f89534b74 Mon Sep 17 00:00:00 2001 From: king <2229249788@qq.com> Date: Tue, 15 Aug 2023 15:48:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=8E=B0=E5=9C=BA=E4=BC=9A?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E5=85=AC=E5=8F=B8=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=8E=B0=E5=9C=BA=E4=BF=AE=E6=94=B9=203.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=8E=B0=E5=9C=BA=E9=82=80=E8=AF=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=20=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 3 - src/api/meeting.ts | 16 ++- src/api/user.ts | 4 +- src/components/button/MyButton.tsx | 9 +- src/config.ts | 4 + src/pages/manage/spotMeeting/spotMeeting.tsx | 95 +++++++++------ src/pages/meeting/meeting.tsx | 118 +++++++++++++++---- 7 files changed, 185 insertions(+), 64 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index 308f498..8ff1394 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -15,8 +15,5 @@ export const loginApi = { }, testLogin() { return request('/token/18708100736', "GET") - }, - meetingInfo(id: string) { - return request(`/api/v1/meetings/meeting/${id}/info`, "GET") } } diff --git a/src/api/meeting.ts b/src/api/meeting.ts index 502ad75..5c22f50 100644 --- a/src/api/meeting.ts +++ b/src/api/meeting.ts @@ -3,7 +3,10 @@ import {request} from "@/api/request"; export interface Meeting { id: number /** 部门ID */ - department_id: number; + dep_id: number | null; + department_id: number | null; + company_id: number, + companyId: number, /** 现场会描述 */ description: string; /** 预计结束时间 */ @@ -18,10 +21,18 @@ export interface Meeting { | 3 // 结束中 } +interface MeetingInfo { + type: number + data: Meeting +} + export const meetingAPi = { setMeetings(data: Meeting) { return request<{ id: number }>('/api/v1/meetings/meeting', "POST", data) }, + putMeeting(id: number, data: Partial) { + return request(`/api/v1/meetings/meeting/${id}`, "PUT", data) + }, setMeeting(id: string) { return request(`/api/v1/meetings/meeting/${id}`, "GET") }, @@ -43,4 +54,7 @@ export const meetingAPi = { end(id: number) { return request(`/api/v1/meetings/meeting/${id}/end`, "PUT") }, + meetingInfo(id: string) { + return request(`/api/v1/meetings/meeting/info?id=${id}`, "GET") + } } diff --git a/src/api/user.ts b/src/api/user.ts index d80e397..0fd4151 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -76,7 +76,7 @@ export const userApi = { return request(`/api/v1/course/${course_id}/info/${unique_ident}`, "GET") }, meetingSave(data: any) { - return request(`/api/v1/user/meeting/save`, "POST", data) + return request(`/api/v1/auth/login/meeting/save`, "POST", data) }, info(user_id: string) { return request(`/api/v1/statistics/${user_id}`, "GET") @@ -88,6 +88,6 @@ export const userApi = { }>(`/api/v1/statistics/statistics/${user_id}?start_time=${data.start_time}&end_time=${data.end_time}`, "GET") }, getCode(phone_number: number) { - return request('/api/v1/sms/send?phone_number='+phone_number, "GET") + return request('/api/v1/sms/send?phone_number=' + phone_number, "GET") } } diff --git a/src/components/button/MyButton.tsx b/src/components/button/MyButton.tsx index d6f168b..ce167c3 100644 --- a/src/components/button/MyButton.tsx +++ b/src/components/button/MyButton.tsx @@ -42,22 +42,27 @@ const MyButton: FC = (props) => { } } + if (props.disabled) { + style.background = '#f5f8f7' + style.color = '#ddd' + style.boxShadow = 'none' + } + return style } return ( ) diff --git a/src/config.ts b/src/config.ts index 080b3d1..f0f1f68 100644 --- a/src/config.ts +++ b/src/config.ts @@ -4,4 +4,8 @@ export const whiteList: string[] = [ '/pages/login/login', '/pages/meeting/meeting', '/pages/preview/preview', + 'pages/check/check', + 'pages/login/login', + 'pages/meeting/meeting', + 'pages/preview/preview', ] diff --git a/src/pages/manage/spotMeeting/spotMeeting.tsx b/src/pages/manage/spotMeeting/spotMeeting.tsx index ed67854..b18246a 100644 --- a/src/pages/manage/spotMeeting/spotMeeting.tsx +++ b/src/pages/manage/spotMeeting/spotMeeting.tsx @@ -9,6 +9,7 @@ import styles from './spotMeeting.module.scss' import code from '@/static/img/code.png' import Icon from "@/components/icon"; import failure from "@/static/img/failure.png" +import {Profile} from "@/store"; const SpotMeeting: FC = () => { const path = encodeURIComponent("/pages/meeting/meeting") @@ -23,6 +24,7 @@ const SpotMeeting: FC = () => { const [loading, setLoading] = useState(false) const [status, setStatus] = useState(0) // 状态 const [id, setId] = useState(params.id ? Number(params.id) : undefined) + const {company} = Profile.useContainer() function setData(res: Meeting | null) { /** @@ -31,13 +33,13 @@ const SpotMeeting: FC = () => { */ if (params.id || id !== res?.id) { setImgUrl('') - setDepid(res?.department_id || null) + setDepid(res?.dep_id || null) setName(res?.name || '') setDescription(res?.description || '') setStatus(res?.status || 0) setId(res?.id || 0) - if (!Array.isArray(res) && res) { + if (res) { downUrl(res.id, false) setEnd(formatDate(new Date(res.estimate_end_time), "YY-MM-dd 18:00:00")) setStart(formatDate(new Date(res.estimate_start_time), "YY-MM-dd 08:00:00")) @@ -120,6 +122,8 @@ const SpotMeeting: FC = () => { } }, }); + } else { + Taro.showToast({title: '请截图保存', icon: 'none'}) } }, [imgUrl]); @@ -166,10 +170,6 @@ const SpotMeeting: FC = () => { Taro.showToast({title: '请填写会议名称', icon: 'error'}) return } - if (!depid) { - Taro.showToast({title: '请选择部门', icon: 'error'}) - return - } setLoading(true) try { @@ -177,7 +177,8 @@ const SpotMeeting: FC = () => { ...values, estimate_end_time: new Date(end).getTime(), estimate_start_time: new Date(start).getTime(), - department_id: depid + dep_id: depid, + company_id: company?.id! }) downUrl(res.id) setStatus(0) @@ -192,14 +193,6 @@ const SpotMeeting: FC = () => { setLoading(false) } - useEffect(() => { - if (imgUrl) { - setImgUrl('') - setStatus(0) - setId(undefined) - } - }, [start, end, name, depid, description]) - /** 开始 */ async function onStart() { try { @@ -222,6 +215,20 @@ const SpotMeeting: FC = () => { } } + async function putMeeting() { + Taro.showLoading() + await meetingAPi.putMeeting(id!, { + name, + dep_id: depid, + company_id: company?.id!, + description, + estimate_end_time: new Date(end).getTime(), + estimate_start_time: new Date(start).getTime(), + }) + Taro.hideLoading() + Taro.showToast({title: '修改成功'}) + } + return ( @@ -251,13 +258,13 @@ const SpotMeeting: FC = () => {
0} + disabled={status > 0} placeholder='请输入会议标题' onInput={(e) => setName(e.detail.value)} />} @@ -265,7 +272,7 @@ const SpotMeeting: FC = () => { change_start(e.detail.value + ' 8:00:00')} name='estimate_start_time'> @@ -273,7 +280,7 @@ const SpotMeeting: FC = () => { change_end(e.detail.value + ' 18:00:00')} name='estimate_end_time'> @@ -282,9 +289,9 @@ const SpotMeeting: FC = () => { mode='selector' range={manages} onChange={depChange} - disabled={!!params.id || status === 1} + disabled={status === 1} rangeKey='name' - name='department_id'> + name='dep_id'> x.id == depid)?.name}/> @@ -299,20 +306,39 @@ const SpotMeeting: FC = () => { {/* style={{height: '60px'}}>*/} {/**/} - { - id !== undefined && <> - { - status === 0 && - 开始 - } + - { - status === 1 && - 结束 - } - - } + { + id !== undefined && <> + { + status === 0 && + 开始 + + } + { + status === 1 && + 结束 + } + + } + + { + imgUrl && + 修改 + + } + { width={200} className={styles.button} loading={loading}> - 保存二维码 + {imgUrl ? "保存二维码" : "新建现场会"} -
diff --git a/src/pages/meeting/meeting.tsx b/src/pages/meeting/meeting.tsx index 3e0c823..16c8e89 100644 --- a/src/pages/meeting/meeting.tsx +++ b/src/pages/meeting/meeting.tsx @@ -1,40 +1,66 @@ -import {FC, useEffect, useState} from "react"; -import {Button, Form, Input, View} from "@tarojs/components"; +import {FC, useCallback, useEffect, useState} from "react"; +import {Form, Input, View} from "@tarojs/components"; import Taro, {useRouter} from "@tarojs/taro"; -import {userApi, loginApi, LoginParams} from "@/api"; +import {userApi, loginApi, LoginParams, meetingAPi, Meeting} from "@/api"; import {Profile} from '@/store' -import {getCurrentInstance} from "@tarojs/runtime"; import {regexTel} from "@/utils/regu"; +import MyButton from "@/components/button/MyButton"; -const Meeting: FC = () => { - const {meeting_id} = getCurrentInstance()?.router?.params as unknown as { meeting_id: string } +interface Params { + meeting_id: string + phone_number?: string + user_name?: string +} + +const MeetingLogin: FC = () => { const {setUser, setToken, setCompany} = Profile.useContainer() + const [codeTime, setCodeTime] = useState(0) + const [phone_number, setPhone_number] = useState() + const [userName, setUserName] = useState('') + const [code, setCode] = useState('') const [h5params, setH5Params] = useState(null) - const router = useRouter() + const [meeting, setMeeting] = useState(null) + const params = useRouter().params as unknown as Params useEffect(() => { loginApi.getMeetingParams().then((res) => { setH5Params(res) }) + if (params.user_name && params.phone_number) { + setPhone_number(Number(params.phone_number)) + setUserName(params.user_name) + Taro.showToast({title: '验证码错误', icon: 'error'}) + } }, []) + + useEffect(() => { + if (codeTime > 0) { + setTimeout(() => { + setCodeTime(codeTime - 1) + }, 1000) + } + }, [codeTime]) + Taro.useLoad(() => { - loginApi.meetingInfo(meeting_id).then(res => { - if (res !== 1) { + meetingAPi.meetingInfo(params.meeting_id).then(res => { + if (res.type !== 1) { Taro.showModal({ - title: '二维码已过期', + title: res.type === 0 ? '暂未开始' : '二维码已过期', success() { Taro.reLaunch({url: '/pages/login/login'}) } }) + return } + setMeeting(res.data) }) }) function submit(e) { const value = e.detail.value - if (!value.user_name || !value.phone_number) { - Taro.showToast({title: '请认真填写', icon: "error"}) + if (!value.user_name) { + Taro.showToast({title: '请写用户名', icon: "error"}) return } @@ -43,6 +69,11 @@ const Meeting: FC = () => { return } + if (!value.phone_code) { + Taro.showToast({title: '请获取手机验证码', icon: 'error'}) + return; + } + if (process.env.TARO_ENV === 'h5') { if (h5params == null) { Taro.showToast({title: '页面参数错误，请刷新页面！', icon: 'error'}) @@ -50,18 +81,21 @@ const Meeting: FC = () => { } location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?" + "appid=" + h5params!.appid + - "&redirect_uri=" + encodeURIComponent(h5params!.route + `?depid=1&phone_number=${value.phone_number}&user_name=${value.user_name}&meeting_id=${meeting_id}`) + + "&redirect_uri=" + + encodeURIComponent( + h5params!.route + + `?dep_id=${meeting?.dep_id}&company_id=${meeting?.companyId}&phone_number=${value.phone_number}&user_name=${value.user_name}&meeting_id=${params.meeting_id}&phone_code=${value.phone_code}` + ) + "&response_type=code" + "&scope=snsapi_userinfo" + "#wechat_redirect"; - } else { Taro.login({ success: async (res) => { const data = await userApi.meetingSave({ ...value, code: res.code, - ticket: router.params.ticket, + meeting_id: params.meeting_id }) setCompany(data.company) setUser(data.user) @@ -72,29 +106,71 @@ const Meeting: FC = () => { Taro.showToast({title: '获取微信登录失败', icon: "error"}) } }) - } } + const getCode = useCallback(async () => { + if (codeTime > 0) return; + if (!phone_number || !regexTel.exec(String(phone_number))) { + Taro.showToast({title: '请输入正确的手机号', icon: 'error'}) + return + } + + try { + await userApi.getCode(phone_number) + Taro.showToast({title: '请注意查收', icon: "none"}) + setCodeTime(60) + } catch (e) { + Taro.showToast({title: '获取短信验证码失败', icon: "error"}) + } + }, [codeTime, phone_number]) + return ( - +
用户名 - + setUserName(e.detail.value)}/> 手机号 - + setPhone_number(Number(e.detail.value))}/> + + + + + 验证码 + + setCode(e.detail.value)} + placeholder='输入验证码'/> + + {codeTime > 0 ? `${codeTime}` : '获取验证码'} + + - + 登记
) } -export default Meeting +export default MeetingLogin