Browse Source

update:signup

Mads 1 week ago
parent
commit
cbfd945350

+ 10 - 7
myapp/src/lib/user/modal-user-register/modal-user-register.component.ts

@@ -37,18 +37,21 @@ export class ModalUserRegisterComponent {
 
     try {
       const user: any = new CloudUser();
-      user.set('username', this.username);
-      user.set('password', this.password);
-      const signedUpUser = await user.signUp();
+      const signedUpUser = await user.signUp(this.username, this.password);
+      if (!signedUpUser) throw new Error('注册失败');
 
+      // ✅ 提示注册成功,关闭当前窗口,返回登录页
       const alert = await this.alertCtrl.create({
         header: '注册成功',
-        message: '欢迎你!',
-        buttons: ['确定']
+        message: '注册成功,请返回登录页登录。',
+        buttons: [{
+          text: '确定',
+          handler: () => {
+            this.modalCtrl.dismiss(null, 'registered');  // 自定义 role
+          }
+        }]
       });
       await alert.present();
-
-      this.modalCtrl.dismiss({ user: signedUpUser }, 'success');
     } catch (error: any) {
       const alert = await this.alertCtrl.create({
         header: '注册失败',

+ 9 - 3
myapp/src/lib/user/page-mine/page-mine.component.ts

@@ -98,13 +98,19 @@ export class PageMineComponent implements OnInit {
   });
   await modal.present();
 
-  const { data, role } = await modal.onWillDismiss();
-  if (role === 'success') {
-    this.currentUser = data.user;
+  const { role } = await modal.onWillDismiss();
+  if (role === 'registered') {
+    const alert = await this.alertCtrl.create({
+      header: '提示',
+      message: '请使用您刚刚注册的账号登录',
+      buttons: ['确定']
+    });
+    await alert.present();
   }
 }
 
 
+
   logout() {
     this.currentUser?.logout();
     this.currentUser = undefined;