update login fetch userInfo

marunrun · Sep 4, 2022 · 1e8a39f · 1e8a39f
1 parent 167ac37
commit 1e8a39f
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 56 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "showstart",
-    "version": "0.1.0"
+    "version": "2.0.0"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/component/chooseUser.tsx b/src/component/chooseUser.tsx
@@ -8,6 +8,7 @@ import {ApiParams} from "../network/apiParams";
 export type UserInfoProps = {
     onPerformerChange: (value: performerInfo[]) => void;
     onAddressChange: (value: AddressInfo) => void;
+    isLogin : boolean
 }
 
 
@@ -39,7 +40,7 @@ const ChooseUser: React.FC<UserInfoProps> = (props) => {
     // 初始化
     useEffect(() => {
         fetchInfo()
-    }, [])
+    }, [props.isLogin])
 
 
     // 观影人信息更新

diff --git a/src/component/login.tsx b/src/component/login.tsx
@@ -5,10 +5,15 @@ import {ApiParams} from "../network/apiParams";
 import {store} from "../constant/store";
 import {LOGIN_PWD} from "../network/api/login";
 
-class LoginForm extends React.Component<any, any> {
 
-    onFinish = (values: any) => {
+export interface LoginProps {
+    afterLoginSuccess: () => void
+}
+
+
+const LoginForm: React.FC<LoginProps> = (props) => {
 
+    function onFinish(values: any) {
 
         localStorage.setItem(store.mobile, values.mobile)
         localStorage.setItem(store.password, values.password)
@@ -18,62 +23,61 @@ class LoginForm extends React.Component<any, any> {
         apiParams.set("password", values.password)
         post(LOGIN_PWD, apiParams, (res) => {
             message.success("登录成功")
-            localStorage.setItem(store.userSign,res.sign)
-            localStorage.setItem(store.userId,res.userId)
+            localStorage.setItem(store.userSign, res.sign)
+            localStorage.setItem(store.userId, res.userId)
+            props.afterLoginSuccess()
         })
-    };
+    }
 
-    render() {
+    return <>
+        <Form
+            size="small"
+            initialValues={{
+                mobile: localStorage.getItem(store.mobile),
+                password: localStorage.getItem(store.password)
+            }}
+            onFinish={onFinish}
+            autoComplete="off"
+        >
+            <Form.Item
+                label="账号"
+                name="mobile"
+                rules={[
+                    {
+                        required: true,
+                        message: '请输入账号',
+                    },
+                ]}
+            >
+                <Input/>
+            </Form.Item>
 
-        return (
-            <Form
-                size="small"
-                initialValues={{
-                    mobile: localStorage.getItem(store.mobile),
-                    password: localStorage.getItem(store.password)
-                }}
-                onFinish={this.onFinish}
-                autoComplete="off"
+            <Form.Item
+                label="密码"
+                name="password"
+                rules={[
+                    {
+                        required: true,
+                        message: '请输入密码',
+                    },
+                ]}
             >
-                <Form.Item
-                    label="账号"
-                    name="mobile"
-                    rules={[
-                        {
-                            required: true,
-                            message: '请输入账号',
-                        },
-                    ]}
-                >
-                    <Input/>
-                </Form.Item>
+                <Input/>
+            </Form.Item>
 
-                <Form.Item
-                    label="密码"
-                    name="password"
-                    rules={[
-                        {
-                            required: true,
-                            message: '请输入密码',
-                        },
-                    ]}
-                >
-                    <Input/>
-                </Form.Item>
+            <Form.Item
+                wrapperCol={{
+                    offset: 2,
+                    span: 16,
+                }}
+            >
+                <Button type="primary" htmlType="submit">
+                    登录
+                </Button>
+            </Form.Item>
+        </Form>
+    </>
 
-                <Form.Item
-                    wrapperCol={{
-                        offset: 2,
-                        span: 16,
-                    }}
-                >
-                    <Button type="primary" htmlType="submit">
-                        登录
-                    </Button>
-                </Form.Item>
-            </Form>
-        );
-    }
 }
 
 export default LoginForm
diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
@@ -25,6 +25,8 @@ const Home: React.FC = () => {
     const [address, setAddress] = React.useState<AddressInfo>();
 
 
+    const [isLogin , setIsLogin] = React.useState<boolean>(false);
+
     // 捡漏
     const [pickupEnable, setPickupEnable] = React.useState<boolean>(false);
     const [pickupTimer, setPickupTimer] = React.useState<number>(0);
@@ -265,10 +267,10 @@ const Home: React.FC = () => {
         <>
             <ProCard gutter={8} title="用户信息">
                 <ProCard>
-                    <LoginForm/>
+                    <LoginForm afterLoginSuccess={() => { setIsLogin(true) }}/>
                 </ProCard>
                 <ProCard>
-                    <ChooseUser onAddressChange={addressChange} onPerformerChange={performerChange}/>
+                    <ChooseUser isLogin={isLogin} onAddressChange={addressChange} onPerformerChange={performerChange}/>
                 </ProCard>
             </ProCard>
             <ProCard style={{marginBlockStart: 8}} gutter={8} title="选择演出">