国家管理员

projects/textbook/src/app/comp-user/comp-user.component.scss

@@ -7,7 +7,7 @@
   height: 100%;
   z-index: 100;
   overflow: auto;
-  background: url('../../../public//img/banner-lab.png') no-repeat;
+  background: url('../../../public//img/banner.png') no-repeat;
   background-size: 100% 100%;
 }
 .title{

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

@@ -177,6 +177,7 @@ export class AccountInfoComponent implements OnInit {
     });
     profile?.set('telephone', params.telephone);
     profile?.set('companyType', params.companyType);
+    profile?.set('email', params.email);
     // profile?.set('idcard', params.idcard);
     profile?.set('identity', '报送联系人');
     profile?.set('identityFile', params.identityFile);

projects/textbook/src/modules/nav-admin/user-edit/user-edit.component.html

@@ -21,14 +21,12 @@
                 >待认证</nz-tag
               >
               } @case ('已认证') {
-              <nz-tag [nzBordered]="false" [nzColor]="'green'"
-                >已认证</nz-tag
-              >
+              <nz-tag [nzBordered]="false" [nzColor]="'green'">已认证</nz-tag>
               } @case ('已禁用') {
-              <nz-tag [nzBordered]="false" [nzColor]="'red'"
-                >已禁用</nz-tag
-              >
-              } }
+              <nz-tag [nzBordered]="false" [nzColor]="'red'">已禁用</nz-tag>
+              } } @if (user.get('isDeleted')) {
+              <nz-tag nzColor="error">已删除</nz-tag>
+              }
             </div>
           </div>
           <div class="id">ID:{{ user?.id }}</div>
@@ -65,20 +63,22 @@
                 }
               </li>
               <li nz-menu-item>
-                <button nz-button nzType="link" style="color: #231c1f">
-                  <span
-                    nz-icon
-                    nzType="stop"
-                    nzTheme="outline"
-                    (click)="updateUser('已禁用')"
-                  ></span
-                  >禁用账号
+                @if (user.get('accountState') != '已禁用') {
+                <button
+                  nz-button
+                  nzType="link"
+                  (click)="updateUser('已禁用')"
+                  style="color: #231c1f"
+                >
+                  <span nz-icon nzType="stop" nzTheme="outline"></span>禁用账号
                 </button>
+                }
               </li>
               <li nz-menu-item>
                 <button
                   (click)="updateUser('删除')"
                   nz-button
+                  [disabled]="user.get('isDeleted')"
                   nzType="link"
                   style="color: #231c1f"
                 >
@@ -169,7 +169,7 @@
           <div nz-col nzSpan="8">
             <div class="lable">邮箱</div>
             <div class="value">
-              {{ user?.get("email") || "未填写" }}
+              {{ user?.get("email") || profile?.get("email") || "未填写" }}
             </div>
           </div>
           <div nz-col nzSpan="8">
@@ -252,7 +252,7 @@
   <ng-container *nzModalContent>
     <input
       nz-input
-      placeholder="请输入新的密码"
+      placeholder="密码格式可以由大小写字母或英文符号及数字组成"
       [(ngModel)]="password"
       type="text"
     />

projects/textbook/src/modules/textbook/page-home/page-home.component.html

@@ -6,7 +6,7 @@
 <!--图片盒子-->
 <div class="landscape-box">
     <!-- Created by ai.fmode.cn imagine -->
-    <img class="landscape" src="/img/banner-lab.png" alt="feima-contest-background">
+    <img class="landscape" src="/img/banner.png" alt="feima-contest-background">
 
     <div class="landscape-text">
         <div class="landscape-title">《“十四五”普通高等教育本科国家级规划教材建设实施方案》</div>

projects/textbook/src/schemas/Profile-list.ts

@@ -154,14 +154,15 @@ export const Profile: ParseSchema = {
       isHeader: true,
       showName: '${phone}',
     },
-    {
-      key: 'user',
-      name: '邮箱',
-      type: 'Pointer',
-      targetClass: '_User',
-      isHeader: true,
-      showName: '${email}',
-    },
+    // {
+    //   key: 'user',
+    //   name: '邮箱',
+    //   type: 'Pointer',
+    //   targetClass: '_User',
+    //   isHeader: true,
+    //   showName: '${email}',
+    // },
+    { key: 'email', name: '邮箱', type: 'String', isHeader: true },
     { key: 'identity', name: '人员类型', type: 'String', isHeader: true },
     {
       key: 'user',