From cbf3069a57c9e8bcb88a9b823e4f0273b626a36a Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 4 Dec 2024 11:28:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 12 + src/layout/header.vue | 13 +- src/views/equip/detail.vue | 6 +- src/views/user/orderManagement/detail.vue | 2 +- src/views/user/orderManagement/index.vue | 271 ++++++++++++++++++++- src/views/user/orderManagementCz/index.vue | 2 +- 6 files changed, 293 insertions(+), 13 deletions(-) diff --git a/components.d.ts b/components.d.ts index 1b3f14e..5a79f43 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,15 +8,23 @@ export {} declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] + ElBadge: typeof import('element-plus/es')['ElBadge'] + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCarousel: typeof import('element-plus/es')['ElCarousel'] + ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] + ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -27,8 +35,12 @@ declare module 'vue' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/layout/header.vue b/src/layout/header.vue index 40f695f..3eb3a45 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -136,12 +136,21 @@ const onSelectRoles = (type: number) => { const getBookCarDetailsData = async () => { const res: any = await getBookCarDetailsApi() - cart.SET_CART_NUM(res.data.length || 0) + let amountNum = 0 + res.data.forEach((e: any) => { + amountNum = e.devInfoVoList.length + amountNum + }) + cart.SET_CART_NUM(amountNum) } getBookCarDetailsData() - const cartNum = computed(() => { return cart.cartNum + + // let amountNum = 0 + // cardList.value.forEach((e: any) => { + // amountNum = e.devInfoVoList.length + amountNum + // }) + // return amountNum }) // 查看预约车 diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue index 8534d58..2ed5306 100644 --- a/src/views/equip/detail.vue +++ b/src/views/equip/detail.vue @@ -929,7 +929,11 @@ const onAddCart = async () => { }) getData() const res: any = await getBookCarDetailsApi() - cart.SET_CART_NUM(res.data.length) + let amountNum = 0 + res.data.forEach((e: any) => { + amountNum = e.devInfoVoList.length + amountNum + }) + cart.SET_CART_NUM(amountNum) } else { ElMessage({ type: 'error', diff --git a/src/views/user/orderManagement/detail.vue b/src/views/user/orderManagement/detail.vue index 88833c6..8c6a8b5 100644 --- a/src/views/user/orderManagement/detail.vue +++ b/src/views/user/orderManagement/detail.vue @@ -323,7 +323,7 @@ const time = ref([]) - +
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index aaf0d2d..45f24e3 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -424,6 +424,225 @@ const confirmFail = async (index: number) => { + + - + @@ -738,7 +952,7 @@ const confirmFail = async (index: number) => {
- + --> { .cart-tbody { background: #fff; padding: 8px 12px; - margin: 10px; + margin-bottom: 6px; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); .cart-user-info { display: flex; @@ -1152,4 +1368,43 @@ const confirmFail = async (index: number) => { background-color: skyblue; z-index: 9999; } + +.order-title-info { + padding: 6px 4px; + font-size: 14px; + color: #999; +} + +.order-items { + border-right: 1px solid #eee; +} + +.order-info { + display: flex; + padding: 10px 0; +} + +.order-items-info { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + border-right: 1px solid #eee; +} + +.red-font { + color: #ff4800; + font-weight: bold; + margin-top: 10px; +} + +.handle-btn { + padding: 0 6px; + display: flex; + flex-wrap: wrap; + align-items: center; + .el-button { + flex: 1; + } +} diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 8f0ec47..13ede3d 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -807,7 +807,7 @@ const handleViewWord = () => {
总费用
-
{{ item.cost }}
+
{{ item.cost }} 元
租期