7 months ago · 88aebbc282
--- a/projects/textbook/src/app/comp-manage/comp-manage.component.html
+++ b/projects/textbook/src/app/comp-manage/comp-manage.component.html
@@ -6,7 +6,7 @@
 
				         svgIcon="menu"
			
 
				         ></mat-icon>
			
 
				       </button>
			
 
				-      {{ isCollapsed ? "" : "“十四五”高等教育国家规划教材申报系统" }}
			
 
				+      {{ isCollapsed ? "" : "“十四五”普通高等教育本科国家级规划教材申报系统" }}
			
 
				     </div>
			
 
				 
			
 
				     <ul
			
--- a/projects/textbook/src/app/comp-user/comp-user.component.html
+++ b/projects/textbook/src/app/comp-user/comp-user.component.html
@@ -3,7 +3,7 @@
 
				       <div class="logo-box">
			
 
				         <div class="logo-content">
			
 
				             <img class="logo-img" src="/img/book.png" alt="feima-contest-logo">
			
 
				-            <div class="logo-font">“十四五”高等教育国家规划教材申报系统</div>
			
 
				+            <div class="logo-font">“十四五”普通高等教育本科国家级规划教材申报系统</div>
			
 
				           </div>
			
 
				     </div>
			
 
				   <div class="login-content">
			
--- a/projects/textbook/src/index.html
+++ b/projects/textbook/src/index.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				 <head>
			
 
				   <meta charset="utf-8">
			
 
				-  <title>国家级规划教材遴选系统 - 本科</title>
			
 
				+  <title>“十四五”普通高等教育本科国家级规划教材申报系统</title>
			
 
				   <base href="/">
			
 
				   <meta name="viewport" content="width=device-width, initial-scale=1">
			
 
				   <link rel="icon" type="image/x-icon" href="favicon.ico">
			
--- a/projects/textbook/src/modules/login/account-info/account-info.component.html
+++ b/projects/textbook/src/modules/login/account-info/account-info.component.html
@@ -221,7 +221,7 @@
 
				               style="width: 100%"
			
 
				               nzShowSearch
			
 
				               nzAllowClear
			
 
				-              nzPlaceHolder="请输入所在单位名称"
			
 
				+              nzPlaceHolder="请输入所在单位名称(需先选择单位类型)"
			
 
				               [(ngModel)]="companyId"
			
 
				               (nzOnSearch)="provinceChange($event)"
			
 
				               [ngModelOptions]="{ standalone: true }"
			
@@ -269,12 +269,11 @@
 
				             class="label"
			
 
				             [nzNoColon]="true"
			
 
				             nzRequired
			
 
				-            >单位联系人认证文件</nz-form-label
			
 
				+            >工作联系人信息表</nz-form-label
			
 
				           >
			
 
				           <nz-input-group nz-col nzSpan="16">
			
 
				             <div
			
 
				               style="
			
 
				-                background: var(--palette-grey---semi-grey-1, #eae6e6);
			
 
				                 padding: 5px 10px;
			
 
				                 border-radius: 5px;
			
 
				               "
			
@@ -282,13 +281,13 @@
 
				               <app-comp-upload
			
 
				                 [width]="320"
			
 
				                 (change)="upload($event)"
			
 
				-                title="上传认证文件"
			
 
				+                title="上传文件"
			
 
				               ></app-comp-upload>
			
 
				             </div>
			
 
				             <div class="text" style="margin: 10px 0; color: #231c1f99">
			
 
				               请
			
 
				               <a href="/file/模板.doc" download="模板"
			
 
				-                >下载单位联系人认证文件模板</a
			
 
				+                >下载工作联系人信息表</a
			
 
				               >，填写盖章后上传 PDF 格式，单个文件大小不超过 2M
			
 
				               <!-- 请<a href="">下载单位联系人认证文件模板</a>，填写盖章后上传。支持上传 PDF、JPG、JPEG、PNG
			
 
				             格式，单个文件大小不超过 2M -->
			
--- a/projects/textbook/src/modules/login/account-info/account-info.component.ts
+++ b/projects/textbook/src/modules/login/account-info/account-info.component.ts
@@ -250,7 +250,7 @@ export class AccountInfoComponent implements OnInit {
 
				       this.loading = false
			
 
				       this.modal.success({
			
 
				         nzTitle: '提交成功',
			
 
				-        nzContent: '',
			
 
				+        nzContent: `<p>请妥善保管您的用户名和密码，待审核认证通过后即可使用邮箱/手机号/用户名和密码登录</p>`,
			
 
				         nzOnOk: () =>
			
 
				           this.router.navigate(['/user/login'], { replaceUrl: true }),
			
 
				       });
			
@@ -266,7 +266,7 @@ export class AccountInfoComponent implements OnInit {
 
				           msg = '注册失败，用户名已存在';
			
 
				           break;
			
 
				       }
			
 
				-      this.message.error(msg);
			
 
				+      this.message.warning(msg);
			
 
				     }
			
 
				   }
			
 
				   upload(e: any) {
			
--- a/projects/textbook/src/modules/login/login/login.component.ts
+++ b/projects/textbook/src/modules/login/login/login.component.ts
@@ -39,10 +39,10 @@ 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'])
			
 
				         }
			
 
				-        console.log(data);
			
 
				       }
			
 
				     });
			
 
				     parseAuthing.initLoginModal();
			
--- a/projects/textbook/src/services/auth.service.ts
+++ b/projects/textbook/src/services/auth.service.ts
@@ -177,9 +177,9 @@ export class AuthServr {
 
				           });
			
 
				           break;
			
 
				       }
			
 
				-      if (!user?.get('accountState')) {
			
 
				-        this.router.navigate(['/user/account_info']);
			
 
				-      }
			
 
				+      // if (!user?.get('accountState')) {
			
 
				+      //   this.router.navigate(['/user/account_info']);
			
 
				+      // }
			
 
				       return;
			
 
				     }
			
 
				     this.router.navigate(['/user/account_info']);