From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:41:50 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
index 8342306..d30a855 100644
--- a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
+++ b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue
@@ -54,7 +54,6 @@
<script setup lang="ts">
import LoginPageLayout from '../components/LoginPageLayout/LoginPageLayout.vue';
import { Policy } from '@/components';
-import * as commonServices from '@12333/services/api/Common';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { FormValidator, Message } from '@12333/utils';
import { LargeButton } from '@/components';
@@ -62,7 +61,8 @@
import { VerificationCodeBusinessType } from '@12333/constants';
import Taro from '@tarojs/taro';
import { ResponseCode } from '@12333/constants';
-import * as accountServices from '@12333/services/api/Account';
+import * as authServices from '@12333/services/apiV2/auth';
+import { APP_ENV } from '@/constants';
defineOptions({
name: 'registerForm',
@@ -89,26 +89,31 @@
});
async function onGetCaptcha() {
- await commonServices.sendVerificationCode(
+ const res = await authServices.sendLoginOrRegisterVerifyCode(
{
phoneNumber: form.phoneNumber,
- businessType: VerificationCodeBusinessType.PhoneMesssageCodeRegister,
},
{
showLoading: false,
- customErrorHandler(error) {
- if (error?.response?.data?.error?.code === ResponseCode.RegisterExistsPhoneNumber) {
- Message.confirm({
- message: '璇ユ墜鏈哄彿宸叉敞鍐岋紝璇峰幓鐧诲綍椤电櫥褰�',
- confirmText: '鍘荤櫥褰�',
- }).then(() => {
- goLogin();
- });
- return true;
- }
- },
+ getResponse: true,
+ // customErrorHandler(error) {
+ // if (error?.response?.data?.error?.code === ResponseCode.RegisterExistsPhoneNumber) {
+ // Message.confirm({
+ // message: '璇ユ墜鏈哄彿宸叉敞鍐岋紝璇峰幓鐧诲綍椤电櫥褰�',
+ // confirmText: '鍘荤櫥褰�',
+ // }).then(() => {
+ // goLogin();
+ // });
+ // return true;
+ // }
+ // },
}
);
+
+ if (res && APP_ENV === 'staging') {
+ // @ts-ignore
+ form.verificationCode = res?.data?.extras?.code ?? '';
+ }
}
async function handleRegister() {
@@ -116,11 +121,11 @@
if (state.policyChecked) {
const { valid } = await formRef.value.validate();
if (valid) {
- let params: API.PhoneMesssageCodeRegisterInput = {
- code: form.verificationCode,
+ let params: API.RegisterPersonalUserCommand = {
+ verifyCode: form.verificationCode,
phoneNumber: form.phoneNumber,
};
- let res = await accountServices.phoneMesssageCodeRegister(params);
+ let res = await authServices.registerPersonalUser(params);
if (res) {
Message.success('娉ㄥ唽鎴愬姛', {
onClosed: () => {
--
Gitblit v1.9.1