From 2ca30a61468234749e77452c9058d3609ece85d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Sep 2024 13:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=9A=E8=AE=AE=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/system/user/model/index.ts | 4 +-
components/AppFooter.vue | 14 +-
components/AppHeader.vue | 24 ++-
components/UnderMaintenance.vue | 2 +-
components/Upload.vue | 61 +++++++
components/UserMenu.vue | 58 +++++++
composables/configState.ts | 18 +-
composables/useServerRequest.ts | 9 +-
layouts/default.vue | 5 +-
nuxt.config.ts | 8 +-
package.json | 3 +-
pages/_____bak/[custom].vue | 79 ---------
pages/_____bak/a/index.vue | 53 ------
pages/_____bak/customs/index.vue | 97 -----------
pages/_____bak/index_.vue | 274 -------------------------------
pages/_____bak/page/[id].vue | 80 ---------
pages/_____bak/spm/[spm].vue | 67 --------
pages/index.vue | 2 +-
pages/login.vue | 183 ++++++++++++++-------
pages/user/auth.vue | 184 +++++++++++++++++++++
pages/user/index.vue | 170 +++++++++----------
pages/user/logout.vue | 13 ++
pages/user/order.vue | 104 ++++++++++++
pages/user/password.vue | 161 ++++++++++++++++++
plugins/element-ui.js | 6 +
pnpm-lock.yaml | 261 ++++++++++++++++++++++++++++-
26 files changed, 1108 insertions(+), 832 deletions(-)
create mode 100644 components/Upload.vue
create mode 100644 components/UserMenu.vue
delete mode 100644 pages/_____bak/[custom].vue
delete mode 100644 pages/_____bak/a/index.vue
delete mode 100644 pages/_____bak/customs/index.vue
delete mode 100644 pages/_____bak/index_.vue
delete mode 100644 pages/_____bak/page/[id].vue
delete mode 100644 pages/_____bak/spm/[spm].vue
create mode 100644 pages/user/auth.vue
create mode 100644 pages/user/logout.vue
create mode 100644 pages/user/order.vue
create mode 100644 pages/user/password.vue
create mode 100644 plugins/element-ui.js
diff --git a/api/system/user/model/index.ts b/api/system/user/model/index.ts
index b72bf94..092f753 100644
--- a/api/system/user/model/index.ts
+++ b/api/system/user/model/index.ts
@@ -1,7 +1,6 @@
import type { PageParam } from '@/api';
import type { Role } from '../../role/model';
import type { Menu } from '../../menu/model';
-import { Company } from '@/api/system/company/model';
/**
* 用户
@@ -16,6 +15,7 @@ export interface User {
// 密码
password?: string;
password2?: string;
+ oldPassword?: string;
// 昵称
nickname?: string;
openId?: string;
@@ -75,7 +75,7 @@ export interface User {
tenantName?: string;
logo?: string;
companyId?: number;
- companyInfo?: Company;
+ companyInfo?: any;
planId?: number;
code?: string;
smsCode?: string;
diff --git a/components/AppFooter.vue b/components/AppFooter.vue
index 2521580..789209f 100644
--- a/components/AppFooter.vue
+++ b/components/AppFooter.vue
@@ -1,5 +1,5 @@
-
diff --git a/pages/_____bak/customs/index.vue b/pages/_____bak/customs/index.vue
deleted file mode 100644
index b6a8183..0000000
--- a/pages/_____bak/customs/index.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-