change api about user

dist/common.js

@@ -270,10 +270,12 @@ function Component(props) {
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   API_CHECK_UNIQUE: function() { return /* binding */ API_CHECK_UNIQUE; },
 /* harmony export */   API_CLEAR_USER: function() { return /* binding */ API_CLEAR_USER; },
 /* harmony export */   API_FAST_PLANS: function() { return /* binding */ API_FAST_PLANS; },
 /* harmony export */   API_LOGIN: function() { return /* binding */ API_LOGIN; },
 /* harmony export */   API_LOGOUT: function() { return /* binding */ API_LOGOUT; },
+/* harmony export */   API_OAUTH_LOGIN: function() { return /* binding */ API_OAUTH_LOGIN; },
 /* harmony export */   API_REGISTER: function() { return /* binding */ API_REGISTER; },
 /* harmony export */   API_USER_INFO: function() { return /* binding */ API_USER_INFO; }
 /* harmony export */ });
@@ -285,8 +287,9 @@ var imgUrl = online ? 'https://api.fast.liveplus.fun/static/image/' : 'https://a
 //common
 var API_ADJUST_TIMES = "".concat(baseUrl, "/api/fast/adjust-times");
 var API_WX_PUB_FOLLOWED = "".concat(baseUrl, "/api/fast/user/wx-pub-followed");
-var API_LOGIN = "".concat(baseUrl, "/api/user/oauth2/login");
-var API_REGISTER = "".concat(baseUrl, "/api/user/register");
+var API_OAUTH_LOGIN = "".concat(baseUrl, "/api/user/oauth2/login");
+var API_LOGIN = "".concat(baseUrl, "/api/user/login/password");
+var API_REGISTER = "".concat(baseUrl, "/api/user/account");
 var API_LOGOUT = "".concat(baseUrl, "/api/user/logout");
 var API_CLEAR_USER = "".concat(baseUrl, "/api/clear/user");
 var API_STATIC_RESOURCES = "".concat(baseUrl, "/api/static-resource-urls");
@@ -294,6 +297,7 @@ var API_USER_INFO = "".concat(baseUrl, "/api/user/info");
 var API_CLEAR_FAST = "".concat(baseUrl, "/api/clear/fasting");
 var API_CLEAR_SLEEP = "".concat(baseUrl, "/api/sleep/clear-my-data");
 var API_CLEAR_MIX = "".concat(baseUrl, "/api/clear-data/FAST_SLEEP");
+var API_CHECK_UNIQUE = "".concat(baseUrl, "/api/user/check-unique");
 
 //track time duration
 var API_FAST_PLANS = "".concat(baseUrl, "/api/fast/plans");
@@ -509,17 +513,35 @@ function _request() {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   clear: function() { return /* binding */ clear; },
+/* harmony export */   login: function() { return /* binding */ login; },
 /* harmony export */   logout: function() { return /* binding */ logout; },
 /* harmony export */   register: function() { return /* binding */ register; },
 /* harmony export */   wxLogin: function() { return /* binding */ wxLogin; }
 /* harmony export */ });
-/* unused harmony exports login, getInfo, update */
+/* unused harmony exports checkUnique, getInfo, update */
 /* harmony import */ var _http_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./http/api */ "./src/services/http/api.js");
 /* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./http/request */ "./src/services/http/request.ts");
 /* harmony import */ var _store_user__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @/store/user */ "./src/store/user.tsx");
 
 
 
+var checkUnique = function checkUnique(username, email) {
+  return new Promise(function (resolve, reject) {
+    (0,_http_request__WEBPACK_IMPORTED_MODULE_1__.request)({
+      url: _http_api__WEBPACK_IMPORTED_MODULE_0__.API_CHECK_UNIQUE,
+      method: 'GET',
+      data: {
+        username: username,
+        email: email
+      }
+    }).then(function (res) {
+      resolve(res);
+      console.log(res);
+      // dispatch(loginSuccess(res));
+    });
+  });
+};
+
 var login = function login(username, password) {
   return function (dispatch) {
     (0,_http_request__WEBPACK_IMPORTED_MODULE_1__.request)({
@@ -537,7 +559,7 @@ var login = function login(username, password) {
 var wxLogin = function wxLogin(code, encryptedData, iv) {
   return function (dispatch) {
     (0,_http_request__WEBPACK_IMPORTED_MODULE_1__.request)({
-      url: _http_api__WEBPACK_IMPORTED_MODULE_0__.API_LOGIN,
+      url: _http_api__WEBPACK_IMPORTED_MODULE_0__.API_OAUTH_LOGIN,
       method: 'POST',
       data: {
         code: code,
@@ -560,7 +582,7 @@ var wxLogin = function wxLogin(code, encryptedData, iv) {
 export const wxLogin = (code: string) => (dispatch: any) => {
     
     request({
-        url: API_LOGIN, method: 'POST', data: { code,type:'WX_MP',app_version:'1',client_version:'1',client_type:'WXP_MP' }
+        url: API_OAUTH_LOGIN, method: 'POST', data: { code,type:'WX_MP',app_version:'1',client_version:'1',client_type:'WXP_MP' }
     }).then(res => {
         console.log(res);
         dispatch(loginSuccess(res));
@@ -569,6 +591,7 @@ export const wxLogin = (code: string) => (dispatch: any) => {
 
 var register = function register(name, email, password) {
   return function (dispatch) {
+    debugger;
     (0,_http_request__WEBPACK_IMPORTED_MODULE_1__.request)({
       url: _http_api__WEBPACK_IMPORTED_MODULE_0__.API_REGISTER,
       method: 'POST',

dist/pages/Auth.js

@@ -236,6 +236,8 @@ function Component(props) {
     if (isButtonDisabled) {
       return;
     }
+    __webpack_require__.g.username = name;
+    __webpack_require__.g.email = email;
     setTimeout(function () {
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_5___default().navigateTo({
         url: "/pages/Auth?type=createPassword&name=".concat(name, "&email=").concat(email)
@@ -394,7 +396,7 @@ function Component(prop) {
     if (isButtonDisabled) {
       return;
     }
-    dispatch((0,_services_user__WEBPACK_IMPORTED_MODULE_10__.register)(prop.name, prop.email, password));
+    dispatch((0,_services_user__WEBPACK_IMPORTED_MODULE_10__.register)(__webpack_require__.g.username, __webpack_require__.g.email, password));
     setTimeout(function () {
       _tarojs_taro__WEBPACK_IMPORTED_MODULE_9___default().navigateBack({
         delta: 2
@@ -468,9 +470,9 @@ function Component(prop) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ Login; }
 /* harmony export */ });
-/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var _components_Inputs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @/components/Inputs */ "./src/components/Inputs.tsx");
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var react_i18next__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-i18next */ "webpack/container/remote/react-i18next");
@@ -480,8 +482,16 @@ function Component(prop) {
 /* harmony import */ var _components_Box__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/components/Box */ "./src/components/Box.tsx");
 /* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @/utils/types */ "./src/utils/types.ts");
 /* harmony import */ var _components_Buttons__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @/components/Buttons */ "./src/components/Buttons.tsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _services_user__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @/services/user */ "./src/services/user.tsx");
+/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react-redux */ "webpack/container/remote/react-redux");
+/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
+/* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__);
+
+
+
 
 
 
@@ -498,14 +508,28 @@ function Component(prop) {
 function Login(props) {
   var _useTranslation = (0,react_i18next__WEBPACK_IMPORTED_MODULE_2__.useTranslation)(),
     t = _useTranslation.t;
+  var dispatch = (0,react_redux__WEBPACK_IMPORTED_MODULE_9__.useDispatch)();
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
-    _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_9__["default"])(_useState, 2),
+    _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState, 2),
     name = _useState2[0],
     setName = _useState2[1];
   var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
-    _useState4 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_9__["default"])(_useState3, 2),
+    _useState4 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_12__["default"])(_useState3, 2),
     password = _useState4[0],
     setPassword = _useState4[1];
+  var user = (0,react_redux__WEBPACK_IMPORTED_MODULE_9__.useSelector)(function (state) {
+    return state.user;
+  });
+  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+    if (user.nickname) {
+      _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().navigateBack({
+        delta: 1
+      });
+      _tarojs_taro__WEBPACK_IMPORTED_MODULE_10___default().redirectTo({
+        url: '/pages/ChooseScenario'
+      });
+    }
+  }, [user.nickname]);
   var handleNameChange = function handleNameChange(value) {
     setName(value);
   };
@@ -514,16 +538,16 @@ function Login(props) {
   };
   var isLoginButtonDisabled = name === '' || password === '';
   function loginComponent() {
-    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_0__["default"], {
+    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_0__["default"], {
         value: name,
         onChange: handleNameChange,
         placeholder: t('feature.auth.login.input_account_placeholder')
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
         style: {
           height: 20
         }
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_0__["default"], {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_0__["default"], {
         value: password,
         isSecure: true,
         onChange: handlePasswordChange,
@@ -531,8 +555,13 @@ function Login(props) {
       })]
     });
   }
-  function registerF() {}
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
+  function LoginF() {
+    if (isLoginButtonDisabled) {
+      return;
+    }
+    dispatch((0,_services_user__WEBPACK_IMPORTED_MODULE_8__.login)(name, password));
+  }
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
     style: {
       backgroundColor: '#000',
       flex: 1,
@@ -541,16 +570,16 @@ function Login(props) {
       width: '100vw',
       height: '100vh'
     },
-    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_4__["default"], {
       text: t('feature.auth.create_account.title'),
       type: _utils_types__WEBPACK_IMPORTED_MODULE_6__.TextType.primary
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_4__["default"], {
       text: t('feature.auth.create_account.sub_title'),
       type: _utils_types__WEBPACK_IMPORTED_MODULE_6__.TextType.secondary
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_5__["default"], {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_5__["default"], {
       child: loginComponent()
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_7__["default"], {
-      onClick: registerF,
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_7__["default"], {
+      onClick: LoginF,
       title: t('feature.auth.create_account.btn_next'),
       style: {
         marginLeft: 23,
@@ -559,25 +588,25 @@ function Login(props) {
         marginBottom: 20
       },
       status: isLoginButtonDisabled ? _utils_types__WEBPACK_IMPORTED_MODULE_6__.ComponentStatus.disable : _utils_types__WEBPACK_IMPORTED_MODULE_6__.ComponentStatus.enable
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
       className: "agree_view",
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Image, {
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Image, {
         style: "width:12px;height:12px;",
         src: _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_3__
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
         className: "agree_text",
         children: t('page.auth.agreement')
       })]
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
       style: {
         flex: 1
       }
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.View, {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.View, {
       className: "footer",
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
         className: "have_account",
         children: t('feature.auth.create_account.footer_desc')
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_10__.Text, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_13__.Text, {
         className: "login",
         onClick: function onClick() {
           return props.register();

src/features/auth/components/CreateAccount.tsx

@@ -35,6 +35,8 @@ export default function Component(props:{login:()=>void}) {
     if (isButtonDisabled) {
       return;
     }
+    global.username = name
+    global.email = email
     setTimeout(() => {
       Taro.navigateTo({
         url: `/pages/Auth?type=createPassword&name=${name}&email=${email}`

src/features/auth/components/CreatePassword.tsx

@@ -41,8 +41,8 @@ export default function Component(prop: { name: string, email: string }) {
       return;
     }
     dispatch(register(
-      prop.name,
-      prop.email,
+      global.username,
+      global.email,
       password
     ) as any);
     setTimeout(() => {

src/features/auth/components/login.tsx

@@ -1,6 +1,6 @@
 import Inputs from "@/components/Inputs";
 import { View, Text, Image } from "@tarojs/components";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import check from '@assets/svg/check.svg'
 import Texts from "@/components/Texts";
@@ -8,11 +8,27 @@ import Box from "@/components/Box";
 import { ComponentStatus, TextType } from "@/utils/types";
 import Buttons from "@/components/Buttons";
 import './Auth.scss'
+import { login } from "@/services/user";
+import { useDispatch, useSelector } from "react-redux";
+import Taro from "@tarojs/taro";
 
-export default function Login(props:{register:()=>void}) {
+export default function Login(props: { register: () => void }) {
     const { t } = useTranslation()
+    const dispatch = useDispatch();
     const [name, setName] = useState('');
     const [password, setPassword] = useState('');
+    const user = useSelector((state: any) => state.user);
+
+    useEffect(() => {
+        if (user.nickname) {
+            Taro.navigateBack({
+                delta: 1
+            })
+            Taro.redirectTo({
+                url: '/pages/ChooseScenario'
+            })
+        }
+    }, [user.nickname])
 
     const handleNameChange = (value: string) => {
         setName(value);
@@ -31,7 +47,11 @@ export default function Login(props:{register:()=>void}) {
         </View>
     }
 
-    function registerF() {
+    function LoginF() {
+        if (isLoginButtonDisabled) {
+            return;
+        }
+        dispatch(login(name, password) as any);
     }
 
     return <View style={{ backgroundColor: '#000', flex: 1, flexDirection: 'column', display: 'flex', width: '100vw', height: '100vh' }}>
@@ -40,7 +60,7 @@ export default function Login(props:{register:()=>void}) {
         <Box child={loginComponent()}></Box>
 
         <Buttons
-            onClick={registerF}
+            onClick={LoginF}
             title={t('feature.auth.create_account.btn_next')}
             style={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20 }}
             status={isLoginButtonDisabled ? ComponentStatus.disable : ComponentStatus.enable}></Buttons>

src/services/http/api.js

@@ -7,8 +7,9 @@ export let imgUrl = online
 //common
 export const API_ADJUST_TIMES = `${baseUrl}/api/fast/adjust-times`
 export const API_WX_PUB_FOLLOWED = `${baseUrl}/api/fast/user/wx-pub-followed`
-export const API_LOGIN = `${baseUrl}/api/user/oauth2/login`
-export const API_REGISTER = `${baseUrl}/api/user/register`
+export const API_OAUTH_LOGIN = `${baseUrl}/api/user/oauth2/login`
+export const API_LOGIN = `${baseUrl}/api/user/login/password`
+export const API_REGISTER = `${baseUrl}/api/user/account`
 export const API_LOGOUT = `${baseUrl}/api/user/logout`
 export const API_CLEAR_USER = `${baseUrl}/api/clear/user`
 export const API_STATIC_RESOURCES = `${baseUrl}/api/static-resource-urls`
@@ -16,6 +17,7 @@ export const API_USER_INFO = `${baseUrl}/api/user/info`
 export const API_CLEAR_FAST = `${baseUrl}/api/clear/fasting`
 export const API_CLEAR_SLEEP = `${baseUrl}/api/sleep/clear-my-data`
 export const API_CLEAR_MIX = `${baseUrl}/api/clear-data/FAST_SLEEP`
+export const API_CHECK_UNIQUE = `${baseUrl}/api/user/check-unique`
 
 //track time duration
 export const API_FAST_PLANS = `${baseUrl}/api/fast/plans`

src/services/user.tsx

@@ -1,7 +1,21 @@
-import { API_LOGIN, API_REGISTER, API_LOGOUT, API_CLEAR_USER, API_USER_INFO } from './http/api'
+import { API_OAUTH_LOGIN, API_REGISTER,API_LOGIN, API_LOGOUT, API_CLEAR_USER, API_USER_INFO,API_CHECK_UNIQUE } from './http/api'
 import { request } from './http/request'
 import { clearSuccess, getInfoSuccess, loginSuccess, logoutSuccess, registerSuccess, updateSuccess } from '@/store/user'
 
+
+export const checkUnique = (username?: string,email?:string) => {
+    return new Promise((resolve, reject) => {
+        request({
+            url: API_CHECK_UNIQUE, method: 'GET', data: { username:username,email:email }
+        }).then(res => {
+            resolve(res);
+            console.log(res);
+            // dispatch(loginSuccess(res));
+        })
+    })
+    
+}
+
 export const login = (username: string, password: string) => (dispatch: any) => {
     request({
         url: API_LOGIN, method: 'POST', data: { username, password }
@@ -12,7 +26,7 @@ export const login = (username: string, password: string) => (dispatch: any) =>
 
 export const wxLogin = (code: string, encryptedData: string, iv: string) => (dispatch: any)=> {
     request({
-        url: API_LOGIN, method: 'POST',
+        url: API_OAUTH_LOGIN, method: 'POST',
         data: {
             code: code,
             type: 'WX_MP',
@@ -33,7 +47,7 @@ export const wxLogin = (code: string, encryptedData: string, iv: string) => (dis
 export const wxLogin = (code: string) => (dispatch: any) => {
     
     request({
-        url: API_LOGIN, method: 'POST', data: { code,type:'WX_MP',app_version:'1',client_version:'1',client_type:'WXP_MP' }
+        url: API_OAUTH_LOGIN, method: 'POST', data: { code,type:'WX_MP',app_version:'1',client_version:'1',client_type:'WXP_MP' }
     }).then(res => {
         console.log(res);
         dispatch(loginSuccess(res));
@@ -41,6 +55,7 @@ export const wxLogin = (code: string) => (dispatch: any) => {
 }*/
 
 export const register = (name: string, email: string, password: string) => (dispatch: any) => {
+    debugger
     request({
         url: API_REGISTER, method: 'POST', data: { client_type: 'IOS', username: name, email: email, password: password }
     }).then(res => {