diff --git a/src/main.jsx b/src/main.jsx index 7377936..7cd4d9d 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -53,7 +53,7 @@ const router = createBrowserRouter([ ReactDOM.createRoot(document.getElementById('root')).render( // - +
Loading...
} />
diff --git a/src/stores/Auth.js b/src/stores/Auth.js index 0011bac..e1b2284 100644 --- a/src/stores/Auth.js +++ b/src/stores/Auth.js @@ -10,6 +10,7 @@ class Auth { email = 'lyj@hainatravel.com' openId = 'iioljiPmZ4RPoOYpkFiSn7IKAiEiE' accountList = ['LYJ', 'LYJAH', 'LYJGH'] + permissionList = ['view_chat', 'send_msg'] } diff --git a/src/views/AccountProfile.jsx b/src/views/AccountProfile.jsx index bb32fc4..de624a0 100644 --- a/src/views/AccountProfile.jsx +++ b/src/views/AccountProfile.jsx @@ -31,7 +31,7 @@ function AccountProfile() { buttonStyle='solid' /> - {loginUser.stateCode} {loginUser.mobile} + {loginUser.mobile} {loginUser.email} diff --git a/src/views/DingdingQRCode.jsx b/src/views/DingdingQRCode.jsx index fe2a3b7..590226f 100644 --- a/src/views/DingdingQRCode.jsx +++ b/src/views/DingdingQRCode.jsx @@ -40,13 +40,13 @@ function DingdingQRCode() { .then(json => { if (json.errcode === 0) { loginUser.userId = json.result.opisn - loginUser.accountName = json.result.opisn + loginUser.accountName = json.result.opicode loginUser.username = json.result.nick loginUser.avatarUrl = json.result.avatarUrl - loginUser.stateCode = json.result.stateCode - loginUser.mobile = json.result.mobile + loginUser.mobile = '+' + json.result.stateCode + '-' + json.result.mobile loginUser.email = json.result.email loginUser.openId = json.result.openId + console.info(JSON.stringify(loginUser)) navigate('/account/profile') } else { setLoginStatus(403) @@ -65,23 +65,23 @@ function DingdingQRCode() { return ( - ]} - /> + status='success' + title='扫码成功' + subTitle='正在获取你的权限' + extra={[ + + ]} + /> ) } else if (loginStatus === 403) { return ( - + ) } else { diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx index 826f467..e53bd2f 100644 --- a/src/views/OrderFollow.jsx +++ b/src/views/OrderFollow.jsx @@ -1,5 +1,3 @@ -import { Conditional } from '@/components/Conditional' -import { useAuthContext } from '@/stores/AuthContext' import { App, Badge, @@ -16,10 +14,41 @@ import { } from 'antd' import { memo, useCallback, useEffect, useState } from 'react' import { NavLink } from 'react-router-dom' +import dayjs from 'dayjs' +import { Conditional } from '@/components/Conditional' +import { useAuthContext } from '@/stores/AuthContext' +import { prepareUrl } from '@/utils/commons' const { RangePicker } = DatePicker const AdvanceSearchForm = memo(function ({ onSubmit }) { + + const DATE_PRESETS = [ + { + label: '本周', + value: [dayjs().startOf('w'), dayjs().endOf('w')], + }, + { + label: '上周', + value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')], + }, + { + label: '本月', + value: [dayjs().startOf('M'), dayjs().endOf('M')], + }, + { + label: '上月', + value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')], + }, + { + label: '前三月', + value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')], + }, + { + label: '本年', + value: [dayjs().startOf('y'), dayjs().endOf('y')], + }, + ]; const [form] = Form.useForm() function handleSubmit(values) { onSubmit?.(values) @@ -28,7 +57,9 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
@@ -83,7 +120,11 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) { - + @@ -94,6 +135,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) { function OrderList({ formValues }) { + console.info(formValues) const orderColumns = [ { title: '订单号', @@ -155,10 +197,24 @@ function OrderList({ formValues }) { const [orderData, setOrderData] = useState([]) const [loading, setLoading] = useState(false) const { loginUser } = useAuthContext() + let fetchOrderUrl = `https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback/getwlorder?opisn=${loginUser.userId}&otype=${formValues.type}` + + if (formValues.type === 'advance') { + const fromDate = formValues.startDateRange[0].format('YYYY-MM-DD') + const thruDate = formValues.startDateRange[1].format('YYYY-MM-DD') + fetchOrderUrl = prepareUrl('https://p9axztuwd7x8a7.mycht.cn/whatsapp_callback/getdvancedwlorder') + .append('opisn', loginUser.userId) + .append('startdate', fromDate) + .append('enddate', thruDate) + .append('tag', formValues.orderLabel) + .append('orderstate', formValues.orderStatus) + .append('coli_id', formValues.orderNumber) + .build() + } useEffect(() => { setLoading(true) - fetch(`http://202.103.68.157:8888/gettodayorder?opisn=${loginUser.userId}`) + fetch(fetchOrderUrl) .then(response => response.json()) .then(json => { if (json.errcode === 0) { @@ -260,11 +316,11 @@ function OrderFollow() { { @@ -277,7 +333,6 @@ function OrderFollow() { buttonStyle='solid' disabled={advanceChecked} /> - { toggleAdvance(!advanceChecked) }} />