diff --git a/projects/admin/src/app/components/app-layout/app-layout.component.html b/projects/admin/src/app/components/app-layout/app-layout.component.html index 2f25b07..3260e16 100644 --- a/projects/admin/src/app/components/app-layout/app-layout.component.html +++ b/projects/admin/src/app/components/app-layout/app-layout.component.html @@ -1,74 +1,153 @@ - - + + - - -
-
-
- - -
    -
  • - 退出登录 -
    • -
- -
-
- - - - -
    -
  • - - 食材管理 -
    • -
  • - - 菜品管理 -
    • + + +
    +
    +
    + + +
      +
    • + 退出登录 +
      • +
    +     +
    +
    +     + + + +
      +
    • + + 食材管理 +
      • +
    • + + 菜品管理 +
      • - -
    • -
        -
      • 食谱库
        • - -
      • 食谱发布计划
        • -
      -
      • -
    • - - 人群营养标准管理 -
      • -
    • - - 单位管理 -
      • -
    • -
        -
      • 用户管理
        • -
      -
      • -
    -     - - - -     -     - \ No newline at end of file +
  • +
      +
    • + 食谱库 +
      • + +
    • + 食谱发布计划 +
      • +
    +
    • +
  • + + 人群营养标准管理 +
    • +
  • + + 单位管理 +
    • +
  • +
      +
    • + 用户管理 +
      • +
    +
    • +
+ + + + + + + + diff --git a/projects/admin/src/app/pages/login/login.component.html b/projects/admin/src/app/pages/login/login.component.html index 6fe5359..64bb766 100644 --- a/projects/admin/src/app/pages/login/login.component.html +++ b/projects/admin/src/app/pages/login/login.component.html @@ -1,63 +1,95 @@ -
- + +
- -
- -
- \ No newline at end of file + +
+ +
+ diff --git a/projects/cdk/src/shared/components/copyright/copyright.component.html b/projects/cdk/src/shared/components/copyright/copyright.component.html new file mode 100644 index 0000000..4aae36c --- /dev/null +++ b/projects/cdk/src/shared/components/copyright/copyright.component.html @@ -0,0 +1,10 @@ +
+ + 蜀ICP备2023038072号 + + ©{{ year }} 成都积络科技有限公司 +
diff --git a/projects/cdk/src/shared/components/copyright/copyright.component.less b/projects/cdk/src/shared/components/copyright/copyright.component.less new file mode 100644 index 0000000..e69de29 diff --git a/projects/cdk/src/shared/components/copyright/copyright.component.ts b/projects/cdk/src/shared/components/copyright/copyright.component.ts new file mode 100644 index 0000000..8453cdd --- /dev/null +++ b/projects/cdk/src/shared/components/copyright/copyright.component.ts @@ -0,0 +1,10 @@ +import { Component } from "@angular/core"; + +@Component({ + selector: "lib-copyright", + templateUrl: "./copyright.component.html", + styleUrls: ["./copyright.component.less"], +}) +export class CopyrightComponent { + year = new Date().getFullYear(); +} diff --git a/projects/cdk/src/shared/components/index.ts b/projects/cdk/src/shared/components/index.ts index e927e43..3e8eacb 100644 --- a/projects/cdk/src/shared/components/index.ts +++ b/projects/cdk/src/shared/components/index.ts @@ -5,3 +5,4 @@ export * from "./dish-select/dish-select.component"; export * from "./print/print.component"; export * from "./forbidden/forbidden.component"; export * from "./notfound/notfound.component"; +export * from "./copyright/copyright.component"; diff --git a/projects/cdk/src/shared/shared.module.ts b/projects/cdk/src/shared/shared.module.ts index 38fcff3..9918ad1 100644 --- a/projects/cdk/src/shared/shared.module.ts +++ b/projects/cdk/src/shared/shared.module.ts @@ -28,6 +28,7 @@ import { PrintComponent, ForbiddenComponent, NotfoundComponent, + CopyrightComponent, } from "./components"; const ngModules = [CommonModule, HttpClientModule, FormsModule, RouterModule, ReactiveFormsModule]; @@ -55,6 +56,7 @@ const cdks = [ PrintComponent, ForbiddenComponent, NotfoundComponent, + CopyrightComponent, ], imports: [...ngZorroModules, ...ngModules, ...cdks, AppPageComponent], exports: [ @@ -71,6 +73,7 @@ const cdks = [ PrintComponent, ForbiddenComponent, NotfoundComponent, + CopyrightComponent, ], }) export class SharedModule {} diff --git a/projects/client/src/app/components/app-layout/app-layout.component.html b/projects/client/src/app/components/app-layout/app-layout.component.html index bce8622..98c11eb 100644 --- a/projects/client/src/app/components/app-layout/app-layout.component.html +++ b/projects/client/src/app/components/app-layout/app-layout.component.html @@ -1,93 +1,179 @@ - - + + - - -
- -
- - -
    -
  • - 退出登录 -
    • -
- -
-
- - - - -
    -
  • - - 使用流程 -
    • -
  • - - 大屏显示 -
    • - -
  • - - 食材管理 -
    • -
  • - - 菜品管理 -
    • - +
  • + + 食材管理 +
    • +
  • + + 菜品管理 +
    • -
  • -
      -
    • 食谱库
      • -
    • 食谱发布计划
      • -
    -
    • +
  • +
      +
    • + 食谱库 +
      • +
    • + 食谱发布计划 +
      • +
    +
    • -
  • -
      -
    • 单位信息设置
      • -
    -
      -
    • 用户管理
      • -
    -
    • -
- - - - - - - \ No newline at end of file +
  • +
      +
    • + 单位信息设置 +
      • +
    +
      +
    • + 用户管理 +
      • +
    +
    • + + + + + + + + + diff --git a/projects/client/src/app/pages/login/login.component.html b/projects/client/src/app/pages/login/login.component.html index 858c9be..4a3b902 100644 --- a/projects/client/src/app/pages/login/login.component.html +++ b/projects/client/src/app/pages/login/login.component.html @@ -1,65 +1,99 @@ -
    - + +
    + +
    - -
    - -
    -     \ No newline at end of file + +
    + +
    +     diff --git a/projects/client/src/app/pages/login/login.component.less b/projects/client/src/app/pages/login/login.component.less index 4aee99a..dac159d 100644 --- a/projects/client/src/app/pages/login/login.component.less +++ b/projects/client/src/app/pages/login/login.component.less @@ -40,7 +40,7 @@ overflow: hidden; .img { - flex: 1; + flex-basis: 40%; height: 100%; background-repeat: no-repeat; background-position: center right; @@ -48,7 +48,7 @@ background-image: url('/assets/images/login-bg.svg'); img { - width: 40vw; + width: 90%; margin-left: -6vw; } } @@ -78,4 +78,12 @@ .btn { margin-top: 16px; } +} + +.copyright { + position: absolute; + bottom: 6px; + left: 50%; + z-index: 100; + transform: translateX(-50%); } \ No newline at end of file