diff --git a/.env.development b/.env.development index d68d966..3d1b43f 100644 --- a/.env.development +++ b/.env.development @@ -9,3 +9,5 @@ VITE_ROUTER_HISTORY = "hash" # 后端地址 VITE_APP_BASE_API = '/dev-api' + +VITE_PUBLIC_IMG_PATH = "/" \ No newline at end of file diff --git a/.env.production b/.env.production index 6b969f3..9a1c108 100644 --- a/.env.production +++ b/.env.production @@ -13,4 +13,6 @@ VITE_CDN = false VITE_COMPRESSION = "none" # 后端地址 -VITE_APP_BASE_API = '/shop-back-end' \ No newline at end of file +VITE_APP_BASE_API = '/shop-back-end' + +VITE_PUBLIC_IMG_PATH = "/shop-admin/" \ No newline at end of file diff --git a/.env.staging b/.env.staging index 6d4f944..29e3105 100644 --- a/.env.staging +++ b/.env.staging @@ -16,4 +16,6 @@ VITE_CDN = false VITE_COMPRESSION = "none" # 后端地址 -VITE_APP_BASE_API = '/shop-back-end' \ No newline at end of file +VITE_APP_BASE_API = '/shop-back-end' + +VITE_PUBLIC_IMG_PATH = "/shop-admin/" \ No newline at end of file diff --git a/src/layout/components/tag/index.scss b/src/layout/components/tag/index.scss index e8d8795..00699ef 100644 --- a/src/layout/components/tag/index.scss +++ b/src/layout/components/tag/index.scss @@ -51,18 +51,19 @@ .scroll-item { position: relative; display: inline-block; - height: 28px; - padding: 0 6px; + height: 38px; + padding: 2px 6px; margin-right: 4px; - line-height: 28px; + line-height: 34px; cursor: pointer; - border-radius: 3px 3px 0 0; - box-shadow: 0 0 1px #888; + border-color: transparent; + border-radius: 6px 6px 0 0; + /* box-shadow: 0 0 1px #888; */ transition: all 0.4s; .el-icon-close { position: absolute; - top: 50%; + top: 48%; font-size: 10px; color: var(--el-color-primary); cursor: pointer; @@ -99,7 +100,7 @@ .scroll-container { position: relative; flex: 1; - padding: 5px 0; + padding: 0; overflow: hidden; white-space: nowrap; @@ -194,7 +195,31 @@ .scroll-item.is-active { position: relative; - color: #fff; + background-color: #e6f7ff; + border-bottom: none; + z-index: 1; + + &::before, + &::after { + content: ''; + position: absolute; + bottom: -6px; + width: 18px; + height: 18px; + background: transparent; + } + + &::before { + left: -18px; + border-bottom-right-radius: 18px; + box-shadow: 9px 0 0 0 #e6f7ff; + } + + &::after { + right: -18px; + border-bottom-left-radius: 18px; + box-shadow: -9px 0 0 0 #e6f7ff; + } &:not(:first-child) { padding-right: 18px; @@ -292,4 +317,4 @@ height: 2px; background: var(--el-color-primary); animation: schedule-out-width 200ms ease-in; -} +} \ No newline at end of file diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue index 1528409..9ecbb83 100644 --- a/src/views/cabinet/smart-cabinet-card/detail.vue +++ b/src/views/cabinet/smart-cabinet-card/detail.vue @@ -7,6 +7,7 @@ import { CabinetImgMap } from "@/utils/cabinetImgMap"; import GatewayConfigModal from "@/views/cabinet/smart-cabinet/GatewayConfigModal.vue"; import ShopConfigModal from "@/views/cabinet/smart-cabinet/ShopConfigModal.vue"; import MainCabinetConfigModal from "@/views/cabinet/smart-cabinet/MainCabinetConfigModal.vue"; +const { VITE_PUBLIC_IMG_PATH: IMG_PATH } = import.meta.env; defineOptions({ name: "SmartCabinetDetail" @@ -48,7 +49,7 @@ onMounted(() => {
-
{{ cabinetInfo.cabinetName }}
diff --git a/src/views/cabinet/smart-cabinet-card/index.vue b/src/views/cabinet/smart-cabinet-card/index.vue index ae3176a..6a2be11 100644 --- a/src/views/cabinet/smart-cabinet-card/index.vue +++ b/src/views/cabinet/smart-cabinet-card/index.vue @@ -12,6 +12,7 @@ import Refresh from "@iconify-icons/ep/refresh"; import View from "@iconify-icons/ep/view"; import AddFill from "@iconify-icons/ri/add-circle-line"; import SmartCabinetCardFormModal from "./smart-cabinet-card-form-modal.vue"; +const { VITE_PUBLIC_IMG_PATH: IMG_PATH } = import.meta.env; defineOptions({ name: "SmartCabinetCard" @@ -113,7 +114,8 @@ onMounted(() => {
- 柜体名称:{{ item.cabinetName }} @@ -148,9 +150,11 @@ onMounted(() => { margin-right: 12px; } } + :deep(.el-descriptions__cell) { - padding-bottom: 1px!important; + padding-bottom: 1px !important; } + .cabinet-card { margin-bottom: 12px; min-height: 210px;