merge

2c9665e5 · 前端-许佳敏 · 2efe44b4 · 2c9665e5
Commit 2c9665e5 authored Aug 24, 2020 by 前端-许佳敏
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

LoginWrap.tsx src/pages/user/components/LoginWrap.tsx +0 -5

No files found.
--- a/src/pages/user/components/LoginWrap.tsx
+++ b/src/pages/user/components/LoginWrap.tsx
@@ -16,13 +16,8 @@ const LoginWrap: React.FC = () => {

  const finish = (value: any) => {
    PublicApi.postMemberLogin(value).then(res => {
-<<<<<<< HEAD
      const { data, code } = res
      if (code === 1000) {
-=======
-      if (res.code === 1000) {
-        const { data } = res
->>>>>>> b6c1ae61f6410dc9d474b42013b4ef4b18157d5e
        setAuth({
          memberId: data.memberId,
          userId: data.userId,