Parcourir la source

注册接口参数修改

fogwind il y a 14 heures
Parent
commit
396a77ee50

+ 1 - 0
README.md

@@ -357,6 +357,7 @@ useEffect 只会在客户端执行,具体是在浏览器绘制后执行,服
     ---- 47 条 请求方法已经扩展是否携带token的参数,但是不再添加对于token的有效性校验,以后端接口返回的错误为依据判断有效性
 48. 游客token的创建优化(想在服务端创建写入token)--- 已完成
 49. 结账页地址模块未登录用户输入邮箱后判断是否注册过,如果注册过让用户登录;--- 已完成
+50. 注册接口,提交的phone是 +1 345345345 格式,但是保存到数据库后成了+1345345345
 
 
 > 39,40 参考 https://chatgpt.com/share/6a4f0637-ad28-83ea-ad44-423740795054

+ 7 - 9
src/app/(public)/customer/login/_components/LoginPageWrapper.tsx

@@ -114,15 +114,13 @@ export function LoginPageWrapper({
     const registerSubmit = async (registerData: RegisterFormData) => {
         overlayLoading.start();
         const registerRes = await userRegister({
-            input: {
-                firstName: registerData.firstName,
-                lastName: registerData.lastName,
-                email: registerData.email,
-                password: registerData.password,
-                confirmPassword: registerData.confirmPassword,
-                phone: registerData.phone,
-                subscribedToNewsLetter: registerData.subscribedToNewsLetter
-            }
+            firstName: registerData.firstName,
+            lastName: registerData.lastName,
+            email: registerData.email,
+            password: registerData.password,
+            confirmPassword: registerData.confirmPassword,
+            phone: registerData.phone,
+            subscribedToNewsLetter: registerData.subscribedToNewsLetter,
         });
         if(!registerRes.error) {
             // 注册成功,登录

+ 9 - 9
src/components/common/LoginModal/LoginModal.tsx

@@ -153,15 +153,15 @@ export default function LoginModal({
         console.log(registerData);
         overlayLoading.start();
         const registerRes = await userRegister({
-            input: {
-                firstName: registerData.firstName,
-                lastName: registerData.lastName,
-                email: registerData.email,
-                password: registerData.password,
-                confirmPassword: registerData.confirmPassword,
-                phone: registerData.phone,
-                subscribedToNewsLetter: registerData.subscribedToNewsLetter
-            }
+
+            firstName: registerData.firstName,
+            lastName: registerData.lastName,
+            email: registerData.email,
+            password: registerData.password,
+            confirmPassword: registerData.confirmPassword,
+            phone: registerData.phone,
+            subscribedToNewsLetter: registerData.subscribedToNewsLetter
+            
         });
         if(!registerRes.error) {
             // 注册成功,登录

+ 3 - 2
src/graphql/customer/mutations/CustomerRegistration.ts

@@ -1,7 +1,8 @@
 import { gql, TypedDocumentNode } from "@apollo/client";
-import {CreateUserResponse} from "@/types/types";
+import {CreateUserResponse,CreateUserVariables} from "@/types/types";
 
-export const CUSTOMER_REGISTRATION: TypedDocumentNode<CreateUserResponse> = gql`
+
+export const CUSTOMER_REGISTRATION: TypedDocumentNode<CreateUserResponse,CreateUserVariables> = gql`
   mutation registerCustomer($input: createCustomerInput!) {
     createCustomer(input: $input) {
       customer {

+ 5 - 5
src/types/types.ts

@@ -360,13 +360,13 @@ export type CreateUserVariables = {
       email: string;
       password: string;
       confirmPassword: string;
-      phone?: string;
+      phone: string;
       gender?: string;
       dateOfBirth?: string;
-      status?: string;
-      isVerified?: string;
-      isSuspended?: string;
-      subscribedToNewsLetter?: boolean;
+      status: string;
+      isVerified: string;
+      isSuspended: string;
+      subscribedToNewsLetter: boolean;
   };
 }
 

+ 11 - 6
src/utils/hooks/useUserRegister.ts

@@ -1,10 +1,8 @@
 import {useCallback} from "react";
 import { useApolloClient } from "@apollo/client/react";
 import { CUSTOMER_REGISTRATION } from "@/graphql";
-import {
-    BagistoUser,
-    CreateUserVariables
-} from "@/types/types";
+import {BagistoUser} from "@/types/types";
+import {RegisterFormData} from "@/types/customer/type";
 
 interface UserRegisterResult {
     data: BagistoUser | null;
@@ -14,10 +12,17 @@ interface UserRegisterResult {
 
 export const useUserRegister = () => {
     const client = useApolloClient();
-    const userRegister = useCallback((params: CreateUserVariables) => {
+    const userRegister = useCallback((params: Omit<RegisterFormData, "isAgree">) => {
         return client.mutate({
             mutation: CUSTOMER_REGISTRATION,
-            variables: params
+            variables: {
+                input: {
+                    ...params,
+                    status: "1",
+                    isVerified: "1",
+                    isSuspended: "0"
+                }
+            }
         }).then((res) => {
             const resData = res.data?.createCustomer.customer ?? null; 
             const result: UserRegisterResult = {