1

pages/user/components/register.uvue

@@ -5,12 +5,12 @@
 		}" :rules="[
 			{
 				required: true,
-				message: '手机号不能为空'
+				message: '用户名不能为空'
 			}
 		] as ClFormRule[]
 			">
 			<cl-input clearable class="" :pt="{ className: '!h-[40px] !rounded-xxl !px-4 !w-[80vw]' }" v-model="form.username"
-				placeholder="请输入手机号（必填）"></cl-input>
+				placeholder="请输入用户名（必填）"></cl-input>
 		</cl-form-item>
 		<cl-form-item prop="password" required :pt="{
 			className: '!mb-4'
@@ -45,6 +45,12 @@
 				password placeholder="请确认密码（必填）">
 			</cl-input>
 		</cl-form-item>
+		<cl-form-item prop="phone" required :pt="{
+			className: '!mb-4'
+		}">
+			<cl-input clearable class="" :pt="{ className: '!h-[40px] !rounded-xxl !px-4 !w-[80vw]' }" v-model="form.phone"
+				placeholder="请输入验证码手机号"></cl-input>
+		</cl-form-item>
 		<cl-form-item prop="code" required :pt="{
 			className: '!mb-4'
 		}" :rules="[
@@ -58,16 +64,9 @@
 				type="number" placeholder="请输入验证码（必填）">
 			</cl-input>
 			<view class="absolute right-0">
-				<sms-btn :ref="refs.set('smsBtn')" :phone="form.username"></sms-btn>
+				<sms-btn :ref="refs.set('smsBtn')" :phone="form.phone"></sms-btn>
 			</view>
 		</cl-form-item>
-		<cl-form-item :pt="{
-			className: '!mb-4'
-		}" prop="nickName">
-			<cl-input clearable :pt="{ className: '!h-[40px] !rounded-xxl !px-4 !w-[80vw]' }" v-model="form.nickName"
-				placeholder="请输入昵称（可选）"></cl-input>
-		</cl-form-item>
-
 
 	</view>
 </template>

pages/user/components/sms-btn.uvue

@@ -37,7 +37,7 @@ const captcha = reactive<Captcha>({
 const countdown = ref(0);
 
 // 是否禁用
-const isDisabled = computed(() => countdown.value > 0 || props.phone == "");
+const isDisabled = computed(() => countdown.value > 0);
 
 // 按钮文案
 const btnText = computed(() =>
@@ -69,6 +69,7 @@ function startCountdown() {
 
 // 发送短信
 async function send() {
+
 	captcha.sending = true;
 	const res = await sendSmsCode({
 		mobile: props.phone,
@@ -85,6 +86,13 @@ async function send() {
 
 // 打开
 function open() {
+	console.log(props.phone);
+	if (props.phone === "" || props.phone === null || props.phone === undefined) {
+		ui.showToast({
+			message: t("请输入验证码手机号")
+		});
+		return;
+	}
 	if (props.phone != "") {
 		if (/^(?:(?:\+|00)86)?1[3-9]\d{9}$/.test(props.phone!)) {
 			captcha.visible = true;