From a7facfd975eaf2f9d4202279ba42d5de88770895 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 27 Nov 2024 09:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto-imports.d.ts | 2 +- components.d.ts | 11 - src/views/user/index.vue | 1 + src/views/user/orderManagement/index.vue | 560 ++++++++++++----------- 4 files changed, 297 insertions(+), 277 deletions(-) diff --git a/auto-imports.d.ts b/auto-imports.d.ts index a606bd4..00e05c3 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -82,6 +82,6 @@ declare global { // for type re-export declare global { // @ts-ignore - export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' + export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue' import('vue') } diff --git a/components.d.ts b/components.d.ts index acc6d37..f4b46fd 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,19 +9,13 @@ declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] -<<<<<<< HEAD ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] -======= ->>>>>>> main ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] -<<<<<<< HEAD ElDialog: typeof import('element-plus/es')['ElDialog'] -======= ->>>>>>> main ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] @@ -29,7 +23,6 @@ declare module 'vue' { ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] -<<<<<<< HEAD ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElProgress: typeof import('element-plus/es')['ElProgress'] @@ -39,10 +32,6 @@ declare module 'vue' { ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] ElUpload: typeof import('element-plus/es')['ElUpload'] -======= - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElRow: typeof import('element-plus/es')['ElRow'] ->>>>>>> main EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default'] EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default'] diff --git a/src/views/user/index.vue b/src/views/user/index.vue index a244a57..2bc777c 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -168,6 +168,7 @@ onMounted(() => { .right-content { width: calc(100% - 260px); height: 100%; + overflow-y: auto; } .active { diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index 07ffa68..4bb9314 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -1,32 +1,32 @@