Browse Source

update 注册

warrior 7 months ago
parent
commit
b31e697c5a

+ 1 - 0
projects/textbook/src/app/comp-upload/comp-upload.component.ts

@@ -45,6 +45,7 @@ export class CompUploadComponent implements OnInit {
         status: 'done',
       };
     });
+    this.Previewfilelist = this.fileList
   }
   ossFileList: any;
   Previewfilelist: any;

+ 1 - 0
projects/textbook/src/modules/login/account-info/account-info.component.html

@@ -322,6 +322,7 @@
         </ul>
       </nz-dropdown-menu>
     </div> -->
+    <a style="color: #231c1f99;font-size: 14px;" (click)="back()">返回</a>
     </div>
   </div>
 </div>

+ 6 - 3
projects/textbook/src/modules/login/account-info/account-info.component.ts

@@ -221,7 +221,7 @@ export class AccountInfoComponent implements OnInit {
       !this.user?.get('accountState') &&
         this.user?.set('accountState', '待认证');
       // this.user?.set('departmentName', params.departmentName);
-      await this.user?.save();
+      let saveUser = await this.user?.save();
 
       let query = new Parse.Query('Profile');
       query.equalTo('user', Parse.User.current()?.id);
@@ -231,7 +231,7 @@ export class AccountInfoComponent implements OnInit {
         let obj = Parse.Object.extend('Profile');
         profile = new obj();
       }
-      profile?.set('user', Parse.User.current()?.toPointer());
+      profile?.set('user', saveUser?.toPointer());
       profile?.set('company', {
         __type: 'Pointer',
         className: 'Company',
@@ -272,7 +272,7 @@ export class AccountInfoComponent implements OnInit {
   upload(e: any) {
     console.log(e);
     let file = e[0];
-    this.identityFile = file?.name;
+    this.identityFile = file?.url;
   }
   //验证手机号或邮箱是否注册
   async authUser(): Promise<boolean> {
@@ -294,4 +294,7 @@ export class AccountInfoComponent implements OnInit {
     }
     return true;
   }
+  back(){
+    history.back()
+  }
 }

+ 0 - 1
projects/textbook/src/modules/login/login/login.component.ts

@@ -39,7 +39,6 @@ export class LoginComponent implements OnInit{
         this.authServr.profileVerify(this.modal)
       },
       beforeChangeModule:(data:any)=>{
-        console.log(data);
         if(data=='register'){
           this.router.navigate(['/user/account_info'])
         }

+ 4 - 4
projects/textbook/src/modules/login/modules.routes.ts

@@ -18,10 +18,10 @@ const routes: Routes = [
   //   path: 'reset_password',
   //   component: ResetPasswordComponent,
   // },
-  {
-    path: 'register',
-    component: RegisterComponent,
-  },
+  // {
+  //   path: 'register',
+  //   component: RegisterComponent,
+  // },
 ];
 @NgModule({
   imports: [RouterModule.forChild(routes)],

+ 1 - 1
projects/textbook/src/modules/nav-author/components/basic-in/basic-in.component.html

@@ -11,7 +11,7 @@
     <nz-form-item style="margin-bottom: 16px">
       <nz-form-label [nzSm]="8" [nzNoColon]="true" [nzXs]="8" nzRequired>国际标准书号(ISBN)</nz-form-label>
       <nz-form-control nzErrorTip="请输入国际标准书号" [nzSm]="12" [nzXs]="12">
-        <nz-input-group [nzAddOnAfter]="autoButton">
+        <nz-input-group nzSearch [nzAddOnAfter]="autoButton">
           <input type="text" nz-input formControlName="ISBN" placeholder="请输入国际标准书号" />
         </nz-input-group>
         <ng-template #autoButton>

+ 16 - 10
projects/textbook/src/services/auth.service.ts

@@ -16,11 +16,11 @@ export class AuthServr {
   resetcountdown: number = 60; //重置密码验证码倒计时
   redirectUrl: string = '';
   roterPath: any = {
-    '国家级管理员': '/nav-admin',
-    '工作联系人': '/nav-province-contact',
-    '高校联系人': '/nav-province-school-contact',
-    '评审专家': '/nav-review',
-    '个人': '/nav-author/manage/space',
+    国家级管理员: '/nav-admin',
+    工作联系人: '/nav-province-contact',
+    高校联系人: '/nav-province-school-contact',
+    评审专家: '/nav-review',
+    个人: '/nav-author/manage/space',
   };
   constructor(
     public router: Router,
@@ -135,6 +135,7 @@ export class AuthServr {
   }
   //验证用户类型
   async profileVerify(modal?: NzModalService) {
+    if(!Parse.User.current()?.id) return
     let query = new Parse.Query('Profile');
     query.equalTo('user', Parse.User.current()?.id);
     query.notEqualTo('isDeleted', true);
@@ -148,7 +149,7 @@ export class AuthServr {
           nzTitle: '该账号已被封禁',
           nzContent: '',
         });
-        return
+        return;
       }
       switch (user?.get('accountState')) {
         case '已认证':
@@ -158,7 +159,7 @@ export class AuthServr {
             console.log(profile);
             localStorage.setItem('profile', JSON.stringify(profile));
             this.textbook.profile = profile;
-            return
+            return;
           }
           this.message.warning('已认证暂无身份');
           break;
@@ -176,10 +177,15 @@ export class AuthServr {
             nzContent: '',
           });
           break;
+        default:
+          !modal && this.message.error('异常账号');
+          modal?.error({
+            nzTitle: '异常账号',
+            nzContent: '',
+          });
+          // this.router.navigate(['/user/account_info']);
+          break;
       }
-      // if (!user?.get('accountState')) {
-      //   this.router.navigate(['/user/account_info']);
-      // }
       return;
     }
     this.router.navigate(['/user/account_info']);