diff --git a/src/pages-order/order/components/OrderStatusInfo/index.vue b/src/pages-order/order/components/OrderStatusInfo/index.vue
index 64d1c9e..822735b 100644
--- a/src/pages-order/order/components/OrderStatusInfo/index.vue
+++ b/src/pages-order/order/components/OrderStatusInfo/index.vue
@@ -1,18 +1,8 @@
-
-
- {{ statusDescription }}
+
+ {{ statusText }}
diff --git a/src/pages-order/order/components/OrderStatusInfo/styles/index.scss b/src/pages-order/order/components/OrderStatusInfo/styles/index.scss
index 18b842e..e69de29 100644
--- a/src/pages-order/order/components/OrderStatusInfo/styles/index.scss
+++ b/src/pages-order/order/components/OrderStatusInfo/styles/index.scss
@@ -1,28 +0,0 @@
-.order-status {
- color: #fff;
- padding: 20px;
- display: flex;
- flex-direction: column;
- align-items: center;
-}
-
-.status-header {
- display: flex;
- align-items: center;
- margin-bottom: 10px;
-}
-
-.status-icon {
- width: 18px;
- height: 18px;
- margin-right: 8px;
-}
-
-.status-text {
- font-size: 18px;
- font-weight: 600;
-}
-
-.status-description {
- font-size: $uni-font-size-sm;
-}
diff --git a/src/pages-order/order/detail.vue b/src/pages-order/order/detail.vue
index b692d1f..d32871a 100644
--- a/src/pages-order/order/detail.vue
+++ b/src/pages-order/order/detail.vue
@@ -3,14 +3,10 @@
-
- {{ title }}
-
-
+ />
@@ -66,20 +62,16 @@ const getOrderDetail = async (orderId) => {
// 监听页面滚动事件
const backgroundColor = ref("transparent");
-const backIconColor = ref("#fff");
-const title = ref("");
+
const shadow = ref(false);
onPageScroll(({ scrollTop }) => {
+ console.log("🚀 ~ scrollTop:", scrollTop);
// 当滚动到顶部时,显示返回按钮
if (scrollTop <= 0) {
backgroundColor.value = "transparent";
- backIconColor.value = "#fff";
- title.value = "";
shadow.value = false;
} else {
backgroundColor.value = "#ffffff";
- backIconColor.value = "#333333";
- title.value = "订单详情";
shadow.value = true;
}
});
diff --git a/src/pages-order/order/images/header_bg.png b/src/pages-order/order/images/header_bg.png
deleted file mode 100644
index 64562c1..0000000
Binary files a/src/pages-order/order/images/header_bg.png and /dev/null differ
diff --git a/src/pages-order/order/styles/detail.scss b/src/pages-order/order/styles/detail.scss
index 7948c99..5d83a49 100644
--- a/src/pages-order/order/styles/detail.scss
+++ b/src/pages-order/order/styles/detail.scss
@@ -1,7 +1,4 @@
.order-detail-wrapper {
- background: url("./images/header_bg.png");
- background-position: 0 0;
- background-size: 100% 242px;
- background-repeat: no-repeat;
- padding: 60px 15px;
+ background: linear-gradient(180deg, #d9eeff 0%, #f5f7fa 100%);
+ padding: 88px 15px;
}
diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue
index b1c480a..d315dce 100644
--- a/src/pages/goods/index.vue
+++ b/src/pages/goods/index.vue
@@ -81,7 +81,6 @@ import { DateUtils } from "@/utils";
import TopNavBar from "@/components/TopNavBar/index.vue";
import ImageSwiper from "@/components/ImageSwiper/index.vue";
import GoodInfo from "./components/GoodInfo/index.vue";
-import GoodConfirm from "./components/GoodConfirm/index.vue";
import Calender from "@/components/Calender/index.vue";
import LocationCard from "@/components/LocationCard/index.vue";
import DateSelector from "./components/DateSelector/index.vue";
diff --git a/src/static/scss/font-size.scss b/src/static/scss/font-size.scss
index 6ce6e3d..f0e57c5 100644
--- a/src/static/scss/font-size.scss
+++ b/src/static/scss/font-size.scss
@@ -38,3 +38,7 @@
.font-size-20 {
font-size: 20px;
}
+
+.font-size-24 {
+ font-size: 24px;
+}
diff --git a/src/static/scss/line-height.scss b/src/static/scss/line-height.scss
index 818bd8a..1d019c1 100644
--- a/src/static/scss/line-height.scss
+++ b/src/static/scss/line-height.scss
@@ -26,3 +26,7 @@
.line-height-24 {
line-height: 24px;
}
+
+.line-height-32 {
+ line-height: 32px;
+}