From efce0fd406a214c2a87bf0c89d8f3fec307f959b Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 26 Nov 2024 09:14:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=BD=E7=95=A5?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
components.d.ts | 10 ----------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 756450d..1d814ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ coverage
auto-imports.d.ts
components.d.ts
components.d.ts
+components.d.ts
diff --git a/components.d.ts b/components.d.ts
index 7316b7b..addf3d5 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -12,12 +12,10 @@ declare module 'vue' {
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']
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']
@@ -25,16 +23,8 @@ declare module 'vue' {
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
- ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
- 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']
- ElTable: typeof import('element-plus/es')['ElTable']
- ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
- ElTabPane: typeof import('element-plus/es')['ElTabPane']
- ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
From 3f9cd683a4e6356cb00136c65990b92a9e3e2edd Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 26 Nov 2024 15:38:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components.d.ts | 11 +
src/assets/font/demo_index.html | 29 +-
src/assets/font/iconfont.css | 10 +-
src/assets/font/iconfont.js | 2 +-
src/assets/font/iconfont.json | 7 +
src/assets/font/iconfont.ttf | Bin 19852 -> 20092 bytes
src/assets/font/iconfont.woff | Bin 12068 -> 12236 bytes
src/assets/font/iconfont.woff2 | Bin 10180 -> 10352 bytes
src/components/Breadcrumb/index.vue | 23 ++
src/http/index.ts | 7 +-
src/router/index.ts | 2 +-
src/views/equip/detail.vue | 431 +++++++++++++++++++++-------
src/views/equip/list.vue | 16 +-
13 files changed, 422 insertions(+), 116 deletions(-)
create mode 100644 src/components/Breadcrumb/index.vue
diff --git a/components.d.ts b/components.d.ts
index addf3d5..dd46610 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,15 +7,18 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
+ Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
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']
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']
@@ -23,8 +26,16 @@ declare module 'vue' {
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+ ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
+ 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']
+ ElTable: typeof import('element-plus/es')['ElTable']
+ ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+ ElTabPane: typeof import('element-plus/es')['ElTabPane']
+ ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
diff --git a/src/assets/font/demo_index.html b/src/assets/font/demo_index.html
index b41ba45..3a8687e 100644
--- a/src/assets/font/demo_index.html
+++ b/src/assets/font/demo_index.html
@@ -54,6 +54,12 @@
+ -
+
+
电话
+ 
+
+
-
购物车
@@ -498,9 +504,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1732329564134') format('woff2'),
- url('iconfont.woff?t=1732329564134') format('woff'),
- url('iconfont.ttf?t=1732329564134') format('truetype');
+ src: url('iconfont.woff2?t=1732599020939') format('woff2'),
+ url('iconfont.woff?t=1732599020939') format('woff'),
+ url('iconfont.ttf?t=1732599020939') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -526,6 +532,15 @@
+ -
+
+
+ 电话
+
+ .icon-dianhua
+
+
+
-
@@ -1192,6 +1207,14 @@
+ -
+
+
电话
+ #icon-dianhua
+
+
-