diff --git a/src/components/TopNavBar/index.vue b/src/components/TopNavBar/index.vue index d5a4a30..f7041e3 100644 --- a/src/components/TopNavBar/index.vue +++ b/src/components/TopNavBar/index.vue @@ -1,22 +1,27 @@ \ No newline at end of file + diff --git a/src/components/TopNavBar/styles/index.scss b/src/components/TopNavBar/styles/index.scss index 9b9c74d..15dc069 100644 --- a/src/components/TopNavBar/styles/index.scss +++ b/src/components/TopNavBar/styles/index.scss @@ -2,7 +2,10 @@ .top-nav-bar { width: 100%; background-color: #ffffff; - box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1); + + &.has-shadow { + box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1); + } &--fixed { position: fixed; @@ -44,6 +47,7 @@ .nav-bar-center { flex: 1; + height: 30px; display: flex; align-items: center; justify-content: center; diff --git a/src/pages-order/order/components/OrderInfo/styles/index.scss b/src/pages-order/order/components/OrderInfo/styles/index.scss index c3f5b8c..ccc8b2c 100644 --- a/src/pages-order/order/components/OrderInfo/styles/index.scss +++ b/src/pages-order/order/components/OrderInfo/styles/index.scss @@ -134,48 +134,8 @@ $transition-normal: 0.3s ease; margin-top: $spacing-large; position: relative; overflow: hidden; - transition: all $transition-normal; letter-spacing: 0.5px; - // 按钮波纹效果 - &::before { - content: ""; - position: absolute; - top: 50%; - left: 50%; - width: 0; - height: 0; - background: rgba(255, 255, 255, 0.3); - border-radius: 50%; - transform: translate(-50%, -50%); - transition: width 0.6s, height 0.6s; - } - - &:hover { - background: linear-gradient( - 135deg, - $button-hover-color 0%, - color.scale($button-hover-color, $lightness: -11.9%) 100% - ); - transform: translateY(-2px); - box-shadow: 0 4px 16px rgba($button-color, 0.4); - - &::before { - width: 300px; - height: 300px; - } - } - - &:active { - transform: translateY(-1px); - box-shadow: 0 2px 8px rgba($button-color, 0.3); - } - - &:focus { - outline: none; - box-shadow: 0 0 0 3px rgba($button-color, 0.3); - } - &:disabled { background: $button-disabled-color; cursor: not-allowed; diff --git a/src/pages-order/order/components/RefundPopup/index.vue b/src/pages-order/order/components/RefundPopup/index.vue index afc1524..8c68978 100644 --- a/src/pages-order/order/components/RefundPopup/index.vue +++ b/src/pages-order/order/components/RefundPopup/index.vue @@ -113,9 +113,9 @@ const commodityPurchaseInstruction = computed(() => { }); // 方法定义 -const show = () => popupRef.value.open(); +const show = () => popupRef.value && popupRef.value.open(); -const hide = () => popupRef.value.close(); +const hide = () => popupRef.value && popupRef.value.close(); // 监听modelValue变化 watch( diff --git a/src/pages-order/order/detail.vue b/src/pages-order/order/detail.vue index 4b118b9..4a4b078 100644 --- a/src/pages-order/order/detail.vue +++ b/src/pages-order/order/detail.vue @@ -1,32 +1,45 @@