From 205e074238ad9470c1cff4eabec7dbd331f8cd2e Mon Sep 17 00:00:00 2001
From: doudou201703 <84085676+doudou201703@users.noreply.github.com>
Date: Mon, 17 Aug 2026 23:35:30 +0800
Subject: [PATCH] =?UTF-8?q?six=5Funiapp=5F0003(=E6=9B=B4=E6=96=B0=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AD=90=E7=BB=84=E4=BB=B6=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ChildComScroll.vue             | 440 +++-----
 src/pageTabBar/Home/Home.vue                  |  92 +-
 src/pageTabBar/Me/Me.vue                      |  95 +-
 src/pages/index.vue                           |  21 +-
 .../商品详情页面/goods-com-pay-card.vue       |   2 +-
 .../商品详情页面/商品详情页面.vue             |  97 +-
 .../商城页面目录/PageShangCheng.vue           |  31 +-
 .../物流追踪页面/物流追踪页面.vue             | 972 +++++++++---------
 .../用户积分页面/用户积分页面.vue             |   2 +-
 .../用户配送地址页面/用户配送地址页面.vue     |  57 +-
 .../订单数据页面/订单数据页面.vue             | 170 +--
 11 files changed, 954 insertions(+), 1025 deletions(-)

diff --git a/src/components/ChildComScroll.vue b/src/components/ChildComScroll.vue
index 835a0f5..eafa31a 100644
--- a/src/components/ChildComScroll.vue
+++ b/src/components/ChildComScroll.vue
@@ -1,138 +1,87 @@
-<style lang="scss" scoped>
-
-
-    .phoneCom {
+<style scoped lang="scss">
+    .child {
+        height: v-bind(整个高度_rpx);
         position: fixed;
         width: 750rpx;
         top: 0;
         left: 0;
         background-color: transparent;
-        z-index: v-bind(zIndex);
+        z-index: 100;
+    }
 
-        .phone-wifi {
-            height: v-bind(wifi_px);
+    .wifi-status {
+        height: v-bind(wifi_height高度_rpx);
+    }
+
+    .status-top {
+        height: v-bind(statusTop高度差_rpx);
+    }
+
+    .status-bottom {
+        //background-color: green;
+        height: v-bind(statusTop高度差_rpx);
+    }
+
+    .status-status {
+        height: v-bind(statusHeight状态栏高度);
+        display: grid;
+        grid-template-columns: v-bind(lef左侧的距离) v-bind(menu胶囊宽度) v-bind(content宽度);
+
+        .status-status-left {
+            width: v-bind(lef左侧的距离);
+            height: v-bind(statusHeight状态栏高度);
         }
 
-        .phone-nav {
-            height: v-bind(nav_px_height);
-            box-sizing: border-box;
-            display: flex;
+        .status-status-menu {
+            // 胶囊
+            height: v-bind(statusHeight状态栏高度);
+            width: v-bind(menu胶囊宽度);
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            grid-template-rows: v-bind(statusHeight状态栏高度);
             align-items: center;
 
-            .meun-height {
-                height: v-bind(meun_px_height);
-                width: 750rpx;
+            .status-status-menu-left {
+                height: v-bind(statusHeight状态栏高度);
                 display: flex;
+                justify-content: center;
+                align-items: center;
 
-                .uniui-left {
-                    width: v-bind(rpxLeftWidth);
-                    display: flex;
-                    height: v-bind(meun_px_height);;
+                .meun-widht-rightimage_item {
+                    height: calc(v-bind(statusHeight状态栏高度) * 0.75);
+                    width: calc(v-bind(statusHeight状态栏高度) * 0.75);
                 }
+            }
 
-                .meun-widht-left {
-                    width: v-bind(divMeunWidht);
-                    height: v-bind(meun_px_height);
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    position: relative;
+            .status-status-menu-right {
+                display: flex;
+                height: v-bind(statusHeight状态栏高度);
+                justify-content: center;
+                align-items: center;
 
-                    :deep(.customClass-icon) {
-                        height: v-bind(meun_px_height);
-
-                        text-align: center;
-                        line-height: v-bind(meun_px_height);
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translate(-50%, -50%); /* 关键：自身偏移回中心 */
-                    }
-
-                    .meun-widht-rightimage_item {
-                        height: v-bind(imgWidthHeight);
-                        width: v-bind(imgWidthHeight);
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translate(-50%, -50%); /* 关键：自身偏移回中心 */
-                    }
-                }
-
-                .meun-widht-middle {
-                    width: v-bind(divMeunWidhtMiddle);
-                    background-color: rgba(255, 255, 255, 0.1);
-                    align-self: center;
-                    height: calc(v-bind(flexMeunHeight) * 0.8);
-
-                    &.light-background {
-                        background-color: #555555;
-                        height: calc(v-bind(flexMeunHeight) * 0.8);
-                        align-self: center;
-                        width: v-bind(divMeunWidhtMiddle);
-                    }
-                }
-
-                .meun-widht-right {
-                    width: v-bind(divMeunWidht);
-                    height: v-bind(meun_px_height);;
-                    position: relative;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-
-                    :deep(.customClass-icon) {
-                        height: v-bind(meun_px_height);
-                        text-align: center;
-                        line-height: v-bind(meun_px_height);
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translate(-50%, -50%); /* 关键：自身偏移回中心 */
-                    }
-
-                    .meun-widht-rightimage_item {
-                        height: v-bind(imgWidthHeight);
-                        width: v-bind(imgWidthHeight);
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translate(-50%, -50%); /* 关键：自身偏移回中心 */
-                    }
-                }
-
-                .FlexTitleWidth {
-                    width: v-bind(rpxFlexTitleWidth);
-                    text-align: center;
-                    display: flex;
-                    align-items: center;
-                    height: v-bind(meun_px_height);
-
-                    .flex-title-text {
-                        width: v-bind(rpxFlexTitleWidth);
-                        height: v-bind(meun_px_height);
-                        line-height: v-bind(meun_px_height);
-                    }
-
-                    .flex-title-slot {
-                        width: v-bind(rpxFlexTitleWidth);
-                        height: v-bind(meun_px_height);
-                    }
+                .meun-widht-rightimage_item {
+                    height: calc(v-bind(statusHeight状态栏高度) * 0.75);
+                    width: calc(v-bind(statusHeight状态栏高度) * 0.75);
                 }
             }
         }
-    }
 
+        .status-status-content {
+            height: v-bind(statusHeight状态栏高度);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
 </style>
 <template>
-    <view class="phoneCom">
-        <view class="phone-wifi">
-            <view class="status-wifi"></view>
-        </view>
-        <view v-if="navShow" class="phone-nav">
-            <view class="meun-height">
-                <view class="uniui-left"></view>
-                <view class="meun-widht-left" @click="emit('homeLeft')">
+    <view class="child">
+        <view class="wifi-status"></view>
+        <view class="status-top"></view>
+        <view class="status-status">
+            <view class="status-status-left"></view>
+            <view class="status-status-menu">
+                <view class="status-status-menu-left" @click="emit('homeLeft')">
                     <wd-icon v-if="modelValue?.isShowLeft.showCom==='icon'"
                              :classPrefix="modelValue?.isShowLeft.iconTextLeft.classPrefix"
                              :name="modelValue?.isShowLeft.iconTextLeft.name"
@@ -143,9 +92,7 @@
                            class="meun-widht-rightimage_item"
                            mode="scaleToFill" webp></image>
                 </view>
-                <view class="meun-widht-middle" :class="{'light-background':theme==='light'}"></view>
-                <view class="meun-widht-right" @click="emit('homeRight')">
-                    <!--                    <wd-icon custom-class="customClass-icon" name="thin-arrow-left" size="18px"></wd-icon>-->
+                <view class="status-status-menu-right" @click="emit('homeRight')">
                     <wd-icon v-if="modelValue?.isShowRight.showCom==='icon'"
                              :classPrefix="modelValue?.isShowRight.iconTextRight.classPrefix"
                              :name="modelValue?.isShowRight.iconTextRight.name"
@@ -156,201 +103,88 @@
                            class="meun-widht-rightimage_item"
                            mode="scaleToFill" webp></image>
                 </view>
-                <view class="FlexTitleWidth">
-                    <view v-if="titleViewShow" class="flex-title-text">{{ modelValue?.title_text }}</view>
-                    <view v-if="slotViewShow" class="flex-title-slot">
-                        <slot name="default"></slot>
-                    </view>
-                </view>
             </view>
+            <view class="status-status-content">{{ modelValue.title_text }}</view>
         </view>
+        <view class="status-bottom"></view>
     </view>
 </template>
-
-<script lang="ts" setup>
-    import {computed, ref, watchEffect} from "vue";
-    import {onShow} from "@dcloudio/uni-app";
+<script setup lang="ts">
+    import {useVModels} from "@vueuse/core";
+    import {computed} from "vue";
     import type {GlobelsChildPropsType} from "@/types/通用类型";
 
-    let theme = ref(uni.getAppBaseInfo().theme); // 返回值为 dark or linght
-    defineOptions({
-        options: {
-            styleIsolation: "shared",
-            virtualHost: true,
-        },
-    });
-    const emit = defineEmits<{
-        (eventName: "update:pxWindowHeight", value: string): void
-        (eventName: "update:pxScrollHeight", value: string): void
-        (eventName: "update:pxScreenHeight", value: string): void
-        (eventName: "update:pxWifiNavHeight", value: string): void
-        (eventName: "update:statusHeight", value: string): void
-        (eventName: "update:meunHeight", value: string): void
-        (eventName: "homeRight"): void
-        (eventName: "homeLeft"): void
-    }>();
-
-
-    //
     interface definePropsType {
-        modelValue?: GlobelsChildPropsType, //跟v-model=值没有关系
-        zIndex?: number
+        modelValue: GlobelsChildPropsType;// 对象类型的 prop
+        statusHeight: string;
+        pxScreenHeight: string;
+        pxWindowHeight: string;//pxWindowHeight
     }
 
+    // 2. 使用 withDefaults 定义默认值
+    const props = withDefaults(defineProps<definePropsType>(), {});
+    const emit = defineEmits<{
+        (eventName: "update:modelValue", value: string): void
+        (eventName: "update:statusHeight", value: string): void
+        (eventName: "update:pxScreenHeight", value: string): void
+        (eventName: "update:pxWindowHeight", value: string): void
+        (eventName: "homeLeft",): void
+        (eventName: "homeRight",): void
+    }>();
+    const {modelValue, statusHeight, pxWindowHeight, pxScreenHeight} = useVModels(props, emit); // 这里是将整个全包在里面了
+    const info_window = wx.getWindowInfo();
+    const pix = 750 / info_window.windowWidth;
+    const wifi_height高度 = computed(() => {
+        return wx.getWindowInfo().statusBarHeight * pix;
+    });
+    const menuButton对象 = wx.getMenuButtonBoundingClientRect();
+    const statusTop高度差 = menuButton对象.top * pix - wifi_height高度.value;
+    const wifi_height高度_rpx = computed(() => {
+        return wifi_height高度.value + "rpx";
+    });
+    const statusTop高度差_rpx = computed(() => {
+        if (statusTop高度差 < 0) {
+            return 0 + "rpx";
+        }
+        if (statusTop高度差 > 0) {
+            return statusTop高度差 + "rpx";
+        }
+    });
+    const menu胶囊的高度 = computed(() => {
+        if (statusTop高度差 < 0) {
+            // return (menuButton对象.height * pix + statusTop高度差);
+            return (menuButton对象.height * pix + statusTop高度差 * 2);
+        } else {
+            return (menuButton对象.height * pix);
+        }
+    });
+    const statusHeight状态栏高度 = menu胶囊的高度.value + "rpx";
+    const 整个高度 = computed(() => {
+        if (statusTop高度差 < 0) {
+            return wifi_height高度.value + menu胶囊的高度.value;
+        } else {
+            return wifi_height高度.value + menu胶囊的高度.value + statusTop高度差 * 2;
+        }
+    });
+    const 整个高度_rpx = 整个高度.value + "rpx";
+    statusHeight.value = 整个高度_rpx;
 
-    const props = withDefaults(defineProps<definePropsType>(), {
-        zIndex: () => (100),
-    });
-    const info_window = uni.getWindowInfo();
-    let pxToRpxScale = 750 / info_window.windowWidth;
-    let meun = uni.getMenuButtonBoundingClientRect();
-    let meun_px_height = computed(() => {
-        return meun.height - 2 + "px";
-    });
-    // 计算当前 wifi的高度
-    let wifiHeing = computed(() => {
-        // 当前wifi的高度 也是分为两种情况下 为负数的时候 小于0 的时候我们就需要减少 wifi的高度,这样才能正确留空
-        if (meun.top - info_window.statusBarHeight < 0) {
-            let num = meun.top - info_window.statusBarHeight;
-            return info_window.statusBarHeight - Math.abs(num) * 2;
-        }
-        return info_window.statusBarHeight;
-    });
-    // 默认的一些宽度
-    let rpxLeftWidth = computed(() => {
-        return (info_window.windowWidth - meun.right) * pxToRpxScale + "rpx";
-    });
-
-    let pxMeunHeight = computed(() => {
-        return meun.height + "px";
-    });
-    let rpxFlexTitleWidth = computed(() => {
-        return (meun.left - meun.width - (info_window.windowWidth - meun.right)) * pxToRpxScale + "rpx";
-    });
-    let divMeunWidht = computed(() => {
-        // 胶囊的一半宽度
-        const halfWidth = Math.ceil(meun.width / 2) - 1;
-        return halfWidth * pxToRpxScale + "rpx";
-    });
-
-    let flexMeunHeight = computed(() => {
-        return Math.ceil(meun.height) * 0.6 + "px";
-    });
-    let divMeunWidhtMiddle = computed(() => {
-        return "1px";
-        // return 2 * pxToRpxScale + "rpx";
-    });
-    let imgWidthHeight = computed(() => {
-        return Math.ceil(meun.height * 0.7 * pxToRpxScale) + "rpx";
-    });
-    let wifi_px = computed(() => {
-        return wifiHeing.value + "px";
-    });
-    // 计算当前导航栏的高度
-    let navHeight = computed(() => {
-        // 导航栏高度 = 胶囊高度 + (胶囊顶部距离 - wifi高度)*2
-        // 这里逻辑也得分二种情况第一情况,减下来值小0 和大于0
-        if (meun.top - info_window.statusBarHeight > 0) {
-            return meun.height + (meun.top - info_window.statusBarHeight) * 2;
-        }
-        if (meun.top - info_window.statusBarHeight <= 0) {
-            return meun.height + Math.abs(meun.top - info_window.statusBarHeight) * 2;
-        }
-        return meun.height + (meun.top - info_window.statusBarHeight) * 2;
-    });
-    let nav_px_height = computed(() => {
-        return navHeight.value + "px";
-    });
-    // 计算可视区域的高度
-    let windowHeight = computed(() => {
-        // 可视区高度 = 屏幕高度 - 可视区域的高度 还需要判断 二 种情况, 一种是有tab, 一种是没有tab的情况
-        // 没有tab栏的情况
-        if (info_window.screenHeight - info_window.windowHeight === 0) {
-            if (info_window.safeAreaInsets.bottom > 0) {
-                // 这是苹果手机的状态(直接返回高度就可以了)
-                return info_window.screenHeight - info_window.safeAreaInsets.bottom;
-            }
-            if (info_window.safeAreaInsets.bottom === 0) {
-                // 这是没有底部安全栏高度时的(华为手机,苹果5678o)
-                return info_window.screenHeight - 34;
-            }
-        }
-        if (info_window.screenHeight - info_window.windowHeight > 0) {
-            return info_window.windowHeight;
-        }
-        return info_window.windowHeight;
-    });
-    // 实时给出高度
-    let wifiShow = ref(true);
-    let navShow = ref(true);
-    let titleViewShow = ref(true);
-    let slotViewShow = ref(false);
-    onShow(() => {
-        emit("update:meunHeight", pxMeunHeight.value);
-    });
-    watchEffect(() => {
-        emit("update:pxScreenHeight", info_window.screenHeight + "px");
-
-        if (props.modelValue?.navIsShow === "default") {
-            // 此时的导航栏高度 = wifi+nav的高度
-            let staus = computed(() => {
-                return (wifiHeing.value + navHeight.value) + "px";
-            });
-            let pxScrollHeight = computed(() => {
-                return windowHeight.value + "px";
-            });
-            emit("update:statusHeight", staus.value);
-            emit("update:pxWindowHeight", staus.value);
-            emit("update:pxScrollHeight", pxScrollHeight.value);
-            emit("update:pxWindowHeight", pxScrollHeight.value);
-        }
-        if (props.modelValue?.navIsShow === "wifi") {
-            // 此时的导航栏高度 = wifi+nav的高度
-            navShow.value = false;
-            let staus = computed(() => {
-                return (wifiHeing.value) + "px";
-            });
-            let pxScrollHeight = computed(() => {
-                // 当值为wifi时,则表明,只想显示一个wifi的状态, 不想显示na的状态
-                return windowHeight.value + "px";
-            });
-            emit("update:statusHeight", staus.value);
-            emit("update:pxWindowHeight", staus.value);
-            emit("update:pxScrollHeight", pxScrollHeight.value);
-            emit("update:pxWindowHeight", pxScrollHeight.value);
-        }
-        if (props.modelValue?.navIsShow === "none") {
-            navShow.value = true;
-            wifiShow.value = false;
-            // 此时的导航栏高度 = wifi+nav的高度
-            let staus = computed(() => {
-                return "0px";
-            });
-            let pxScrollHeight = computed(() => {
-                // 当值为wifi时,则表明,只想显示一个wifi的状态, 不想显示na的状态
-                return windowHeight.value + "px";
-            });
-            emit("update:statusHeight", staus.value);
-            emit("update:pxWindowHeight", staus.value);
-            emit("update:pxScrollHeight", pxScrollHeight.value);
-            emit("update:pxWindowHeight", pxScrollHeight.value);
-        }
-        if (props.modelValue?.navIsShow === "slot") {
-            slotViewShow.value = true;
-            titleViewShow.value = false;
-            // 此时的导航栏高度 = wifi+nav的高度
-            let staus = computed(() => {
-                return (wifiHeing.value + navHeight.value) + "px";
-            });
-
-            let pxScrollHeight = computed(() => {
-                // 当值为wifi时,则表明,只想显示一个wifi的状态, 不想显示na的状态
-                return windowHeight.value + "px";
-            });
-            emit("update:statusHeight", staus.value);
-            emit("update:pxWindowHeight", staus.value);
-            emit("update:pxScrollHeight", pxScrollHeight.value);
-            emit("update:pxWindowHeight", pxScrollHeight.value);
+    if (modelValue.value.navIsShow === "none") {
+        statusHeight.value = "0rpx";
+    }
+    if (modelValue.value.navIsShow === "default") {
+        statusHeight.value = 整个高度_rpx;
+    }
+    const lef左侧的距离 = 750 - menuButton对象.right * pix + "rpx";
+    const menu胶囊宽度 = menuButton对象.width * pix + "rpx";
+    const content宽度 = 750 - (750 - menuButton对象.right * pix) * 2 - (menuButton对象.width * pix) * 2 + "rpx";
+    const window屏幕可用高度 = computed(() => {
+        if (info_window.screenHeight === info_window.windowHeight) {
+            return (info_window.screenHeight - (info_window.screenHeight - info_window.safeArea.bottom)) * pix;
+        } else {
+            return info_window.windowHeight * pix;
         }
     });
-</script>
\ No newline at end of file
+    pxScreenHeight.value = info_window.screenHeight * pix + "rpx";
+    pxWindowHeight.value = window屏幕可用高度.value + "rpx";
+</script>
diff --git a/src/pageTabBar/Home/Home.vue b/src/pageTabBar/Home/Home.vue
index 8efd748..820267a 100644
--- a/src/pageTabBar/Home/Home.vue
+++ b/src/pageTabBar/Home/Home.vue
@@ -107,41 +107,40 @@
             }
         }
 
-
-        .scrollTopHeigh {
-            /*在滚动区域内的, 可以自定义的高度*/
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
             box-sizing: border-box;
-            height: $defaultTopHeight;
-            background-color: rgba(255, 255, 255, 0.05);
-        }
 
+            .scrollTopHeigh {
+                /*在滚动区域内的, 可以自定义的高度*/
+                box-sizing: border-box;
+                //background-color: rgba(255, 255, 255, 0.05);
+            }
 
-        .scrollViewHeigh {
-            /*滚动页面区域范围*/
-            box-sizing: border-box;
-            font-size: 1rem;
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
-            overflow: hidden;
+            .scrollViewHeigh {
+                /*滚动页面区域范围*/
+                box-sizing: border-box;
+                font-size: 1rem;
+                overflow: hidden;
 
-            :deep() {
-                /*button按钮的 阴影样式可以直接使用*/
-                .custom-class-button {
-                    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                :deep() {
+                    /*button按钮的 阴影样式可以直接使用*/
+                    .custom-class-button {
+                        box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    }
                 }
             }
 
-
+            .scrollBottomHeigh {
+                box-sizing: border-box;
+                height: 1px;
+                @include line-color();
+            }
         }
 
-        .scrollBottomHeigh {
-            box-sizing: border-box;
-            height: $xiaoBottomHeigh;
-            @include line-color();
-        }
-
-        .fixed-is-show {
-            transition: opacity 0.3s ease, transform 0.3s ease;
-        }
 
     }
 </style>
@@ -150,9 +149,10 @@
         <wd-config-provider :theme="theme">
             <view class="root-container">
                 <view class="status-wifi-nav">
-                    <ChildComScroll v-model:meunHeight="meunHeight" v-model:pxScreenHeight="pxScreenHeight"
-                                    v-model:pxScrollHeight="pxScrollHeight" v-model:pxWindowHeight="pxWindowHeight"
-                                    v-model:statusHeight="statusHeight" :modelValue="modelValue" @homeLeft="homeLeft"
+                    <ChildComScroll v-model:pxScreenHeight="pxScreenHeight"
+                                    v-model:pxWindowHeight="pxWindowHeight"
+                                    v-model:statusHeight="statusHeight"
+                                    :modelValue="modelValue" @homeLeft="homeLeft"
                                     @homeRight="homeRight">
                         <template v-slot:default>
                             <view class="default-view-slot" @click="defaultSearchChange">
@@ -166,23 +166,27 @@
                             </view>
                         </template>
                     </ChildComScroll>
+
+                </view>
+                <view class="grit-content">
+                    <view class="scrollTopHeigh"><!--预留的空间高度--></view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
+                        <view class="page">
+                            <view class="line-widht-number" style="height: 5rpx"></view>
+                            <home-com-title></home-com-title>
+                            <view class="line-widht-number" style="height: 15rpx"></view>
+                            <home-com-chao-hua-shuai></home-com-chao-hua-shuai>
+                            <view class="line-widht-number" style="height: 20rpx"></view>
+                            <home-com-hong-meng></home-com-hong-meng>
+                        </view>
+                    </scroll-view>
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域--></view>
                 </view>
                 <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度--></view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
-                    <view class="page">
-                        <view class="line-widht-number" style="height: 5rpx"></view>
-                        <home-com-title></home-com-title>
-                        <view class="line-widht-number" style="height: 15rpx"></view>
-                        <home-com-chao-hua-shuai></home-com-chao-hua-shuai>
-                        <view class="line-widht-number" style="height: 20rpx"></view>
-                        <home-com-hong-meng></home-com-hong-meng>
-                    </view>
-                </scroll-view>
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域--></view>
+
                 <wd-toast selector="default-toast"/>
                 <wd-message-box selector="default-message-box"/>
             </view>
diff --git a/src/pageTabBar/Me/Me.vue b/src/pageTabBar/Me/Me.vue
index 6f0b1af..287c393 100644
--- a/src/pageTabBar/Me/Me.vue
+++ b/src/pageTabBar/Me/Me.vue
@@ -91,6 +91,39 @@
             }
         }
 
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
+            box-sizing: border-box;
+
+            .scrollTopHeigh {
+                /*在滚动区域内的, 可以自定义的高度*/
+                box-sizing: border-box;
+                //background-color: rgba(255, 255, 255, 0.05);
+            }
+
+            .scrollViewHeigh {
+                /*滚动页面区域范围*/
+                box-sizing: border-box;
+                font-size: 1rem;
+                overflow: hidden;
+
+                :deep() {
+                    /*button按钮的 阴影样式可以直接使用*/
+                    .custom-class-button {
+                        box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    }
+                }
+            }
+
+            .scrollBottomHeigh {
+                box-sizing: border-box;
+                height: 1px;
+                @include line-color();
+            }
+        }
 
         .scrollTopHeigh {
             /*在滚动区域内的, 可以自定义的高度*/
@@ -154,39 +187,45 @@
         <wd-config-provider :theme="theme">
             <view class="root-container">
                 <view class="status-wifi-nav">
-                    <ChildComScroll v-model:meunHeight="meunHeight" v-model:pxScreenHeight="pxScreenHeight"
-                                    v-model:pxScrollHeight="pxScrollHeight" v-model:pxWindowHeight="pxWindowHeight"
-                                    v-model:statusHeight="statusHeight" :modelValue="modelValue" @homeLeft="homeLeft"
+                    <ChildComScroll v-model:pxScreenHeight="pxScreenHeight"
+                                    v-model:pxWindowHeight="pxWindowHeight"
+                                    v-model:statusHeight="statusHeight"
+                                    :modelValue="modelValue" @homeLeft="homeLeft"
                                     @homeRight="homeRight">
-                        <template v-slot:default>
-                            <view class="default-view-slot" @click="defaultSearchChange">
-                                <view class="default-view-slot-left"></view>
-                                <view class="default-view-slot-right">
-                                    <image :lazy-load="true" class="title-imgimage_item" mode="scaleToFill"
-                                           src="https://hudie.xiao.band/search.png" webp/>
-                                    <view class="default-view-slot-right-text">搜索</view>
-                                </view>
-                                <view class="line-widht-number" style="width: 30rpx"></view>
-                            </view>
-                        </template>
+                        <!--                        <template v-slot:default>-->
+                        <!--                            <view class="default-view-slot" @click="defaultSearchChange">-->
+                        <!--                                <view class="default-view-slot-left"></view>-->
+                        <!--                                <view class="default-view-slot-right">-->
+                        <!--                                    <image :lazy-load="true" class="title-imgimage_item" mode="scaleToFill"-->
+                        <!--                                           src="https://hudie.xiao.band/search.png" webp/>-->
+                        <!--                                    <view class="default-view-slot-right-text">搜索</view>-->
+                        <!--                                </view>-->
+                        <!--                                <view class="line-widht-number" style="width: 30rpx"></view>-->
+                        <!--                            </view>-->
+                        <!--                        </template>-->
                     </ChildComScroll>
+
                 </view>
-                <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度-->
-                    <view class="line-widht-number" style="height: 20rpx"></view>
-                </view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
-                    <view class="">
-                        <me-com-user-info></me-com-user-info>
-                        <view class="line-widht-number" style="height: 10rpx"></view>
-                        <me-com-user-server></me-com-user-server>
+                <view class="grit-content">
+                    <!--分隔线,上面的是子组件-->
+                    <view class="scrollTopHeigh"><!--预留的空间高度-->
+                        <view class="line-widht-number" style="height: 20rpx"></view>
+                    </view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
+                        <view class="">
+                            <me-com-user-info></me-com-user-info>
+                            <view class="line-widht-number" style="height: 10rpx"></view>
+                            <me-com-user-server></me-com-user-server>
+                        </view>
+                    </scroll-view>
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域-->
                     </view>
-                </scroll-view>
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域-->
                 </view>
+
+
             </view>
         </wd-config-provider>
     </view>
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 0dfa083..849ffde 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -159,8 +159,8 @@
                         内容
                         <view class="">
                             <wd-button type="primary" icon="phone" :block="true"
-                                       @click="buttonClick" custom-class="custom-shadow">
-                                信息按钮
+                                       @click="小程序发起支付" custom-class="custom-shadow">
+                                小程序发起支付
                             </wd-button>
                         </view>
                     </scroll-view>
@@ -177,12 +177,13 @@
 </template>
 <script lang="ts" setup>
     import ChildComScroll from "@/components/ChildComScroll.vue";
-    import type {GlobelsChildPropsType} from "@/types/通用类型";
+    import type {ApiAxiosResponse, GlobelsChildPropsType} from "@/types/通用类型";
     import {onTabItemTap} from "@dcloudio/uni-app";
     import {useMainXiaoStore} from "@/stores/piniaPro/miniChatStore";
     import {useMessage, useToast} from "wot-design-uni";
     import type {ConfigProviderTheme} from "wot-design-uni/components/wd-config-provider/types";
     import {ref} from "vue";
+    import {useRequest} from "@uni-helper/uni-use";
 
     defineOptions({options: {styleIsolation: "shared"}}); // 组件使用
     let toast = useToast("default-toast");
@@ -232,5 +233,19 @@
         await wx.vibrateShort({type: "heavy"});//medium heavy light
         console.log("=============");
     });
+    const 小程序发起支付 = async (): Promise<void> => {
+        try {
+            let data = await useRequest<ApiAxiosResponse<Array<string>, WechatMiniprogram.RequestPaymentOption>>(
+                "https://xiao.sixgou.com/demopay/jsapi/", {
+                    method: "POST",
+                    data: {self_mini_openid: xiaoMain.mini_openid, self_mini_unionid: xiaoMain.mini_unionid,}
+                });
+            await wx.requestPayment({...data.data.value!.resData.dictData});
+        } catch (e) {
+            console.log(e, "❌❌❌❌❌❌❌❌❌❌捕获支付错误");
+            toast.error({msg: "支付取消", position: "middle"});
+        }
+    };
+
 
 </script>
diff --git a/src/subPackages/homeSubPages/商品详情页面/goods-com-pay-card.vue b/src/subPackages/homeSubPages/商品详情页面/goods-com-pay-card.vue
index ee1568c..0e5e7a2 100644
--- a/src/subPackages/homeSubPages/商品详情页面/goods-com-pay-card.vue
+++ b/src/subPackages/homeSubPages/商品详情页面/goods-com-pay-card.vue
@@ -730,7 +730,7 @@
 
     async function 打开支付弹窗(): Promise<void> {
         showRules.value = true;
-        await wx.vibrateShort({type: "medium"});//medium heavy light
+        await wx.vibrateShort({type: "medium"});    //medium heavy light
     }
 
     async function 关闭弹框(): Promise<void> {
diff --git a/src/subPackages/homeSubPages/商品详情页面/商品详情页面.vue b/src/subPackages/homeSubPages/商品详情页面/商品详情页面.vue
index 0dd68fd..12860d5 100644
--- a/src/subPackages/homeSubPages/商品详情页面/商品详情页面.vue
+++ b/src/subPackages/homeSubPages/商品详情页面/商品详情页面.vue
@@ -92,37 +92,46 @@
             }
         }
 
-
-        .scrollTopHeigh {
-            /*在滚动区域内的, 可以自定义的高度*/
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
             box-sizing: border-box;
-            height: $defaultTopHeight;
-            background-color: rgba(255, 255, 255, 0.05);
-        }
 
-
-        .scrollViewHeigh {
-            /*滚动页面区域范围*/
-            box-sizing: border-box;
-            font-size: 1rem;
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
-            overflow: hidden;
-
-            :deep() {
-                /*button按钮的 阴影样式可以直接使用*/
-                .custom-shadow {
-                    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
-                }
+            .scrollTopHeigh {
+                /*在滚动区域内的, 可以自定义的高度*/
+                box-sizing: border-box;
+                height: $defaultTopHeight;
+                background-color: rgba(255, 255, 255, 0.05);
             }
 
 
+            .scrollViewHeigh {
+                /*滚动页面区域范围*/
+                box-sizing: border-box;
+                font-size: 1rem;
+                height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
+                overflow: hidden;
+
+                :deep() {
+                    /*button按钮的 阴影样式可以直接使用*/
+                    .custom-shadow {
+                        box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    }
+                }
+
+
+            }
+
+            .scrollBottomHeigh {
+                box-sizing: border-box;
+                height: $xiaoBottomHeigh;
+                //@include line-color();
+            }
+
         }
 
-        .scrollBottomHeigh {
-            box-sizing: border-box;
-            height: $xiaoBottomHeigh;
-            //@include line-color();
-        }
     }
 </style>
 <template>
@@ -147,27 +156,29 @@
                         </template>
                     </ChildComScroll>
                 </view>
-                <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度--></view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
+                <view class="grit-content">
+                    <!--分隔线,上面的是子组件-->
+                    <view class="scrollTopHeigh"><!--预留的空间高度--></view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
 
-                    <goods-com-swiper-images></goods-com-swiper-images>
-                    <goods-com-params></goods-com-params>
-                    <goods-com-share></goods-com-share>
-                    <view class="line-widht-number" style="height: 20rpx"></view>
-                    <goods-com-service-params></goods-com-service-params>
-                    <goods-com-product_sales_specifications></goods-com-product_sales_specifications>
-                    <view class="line-widht-number" style="height: 10rpx"></view>
-                    <goods-com-list-images></goods-com-list-images>
-                </scroll-view>
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域-->
-                    <goods-com-pay-card></goods-com-pay-card>
+                        <goods-com-swiper-images></goods-com-swiper-images>
+                        <goods-com-params></goods-com-params>
+                        <goods-com-share></goods-com-share>
+                        <view class="line-widht-number" style="height: 20rpx"></view>
+                        <goods-com-service-params></goods-com-service-params>
+                        <goods-com-product_sales_specifications></goods-com-product_sales_specifications>
+                        <view class="line-widht-number" style="height: 10rpx"></view>
+                        <goods-com-list-images></goods-com-list-images>
+                    </scroll-view>
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域-->
+                        <goods-com-pay-card></goods-com-pay-card>
+                    </view>
+                    <wd-toast selector="default-toast"/>
+                    <wd-message-box selector="default-message-box"/>
                 </view>
-                <wd-toast selector="default-toast"/>
-                <wd-message-box selector="default-message-box"/>
 
             </view>
         </wd-config-provider>
diff --git a/src/subPackages/homeSubPages/商城页面目录/PageShangCheng.vue b/src/subPackages/homeSubPages/商城页面目录/PageShangCheng.vue
index e494ab6..cb097c3 100644
--- a/src/subPackages/homeSubPages/商城页面目录/PageShangCheng.vue
+++ b/src/subPackages/homeSubPages/商城页面目录/PageShangCheng.vue
@@ -91,7 +91,7 @@
 
 
         .grit-content {
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight));
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
             display: grid;
             grid-template-columns: 1fr;
             grid-auto-rows: auto 1fr auto;
@@ -329,21 +329,22 @@
         <wd-config-provider :theme="theme">
             <view class="root-container">
                 <view class="status-wifi-nav">
-                    <ChildComScroll v-model:meunHeight="meunHeight" v-model:pxScreenHeight="pxScreenHeight"
-                                    v-model:pxScrollHeight="pxScrollHeight" v-model:pxWindowHeight="pxWindowHeight"
-                                    v-model:statusHeight="statusHeight" :modelValue="modelValue" @homeLeft="homeLeft"
+                    <ChildComScroll v-model:pxScreenHeight="pxScreenHeight"
+                                    v-model:pxWindowHeight="pxWindowHeight"
+                                    v-model:statusHeight="statusHeight"
+                                    :modelValue="modelValue" @homeLeft="homeLeft"
                                     @homeRight="homeRight">
-                        <template v-slot:default>
-                            <view class="default-view-slot" @click="defaultSearchChange">
-                                <view class="default-view-slot-left"></view>
-                                <view class="default-view-slot-right">
-                                    <image :lazy-load="true" class="title-imgimage_item" mode="scaleToFill"
-                                           src="https://hudie.xiao.band/search.png" webp/>
-                                    <view class="default-view-slot-right-text">搜索</view>
-                                </view>
-                                <view class="line-widht-number" style="width: 30rpx"></view>
-                            </view>
-                        </template>
+                        <!--                        <template v-slot:default>-->
+                        <!--                            <view class="default-view-slot" @click="defaultSearchChange">-->
+                        <!--                                <view class="default-view-slot-left"></view>-->
+                        <!--                                <view class="default-view-slot-right">-->
+                        <!--                                    <image :lazy-load="true" class="title-imgimage_item" mode="scaleToFill"-->
+                        <!--                                           src="https://hudie.xiao.band/search.png" webp/>-->
+                        <!--                                    <view class="default-view-slot-right-text">搜索</view>-->
+                        <!--                                </view>-->
+                        <!--                                <view class="line-widht-number" style="width: 30rpx"></view>-->
+                        <!--                            </view>-->
+                        <!--                        </template>-->
                     </ChildComScroll>
                 </view>
                 <!--分隔线,上面的是子组件-->
diff --git a/src/subPackages/homeSubPages/物流追踪页面/物流追踪页面.vue b/src/subPackages/homeSubPages/物流追踪页面/物流追踪页面.vue
index 4d746ea..c957f8d 100644
--- a/src/subPackages/homeSubPages/物流追踪页面/物流追踪页面.vue
+++ b/src/subPackages/homeSubPages/物流追踪页面/物流追踪页面.vue
@@ -138,429 +138,439 @@
             }
         }
 
-
-        .scrollTopHeigh {
-            /*在滚动区域内的, 可以自定义的高度*/
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
             box-sizing: border-box;
-            height: $defaultTopHeight;
-            background-color: rgba(255, 255, 255, 0.05);
-        }
 
-
-        .scrollViewHeigh {
-            /*滚动页面区域范围*/
-            box-sizing: border-box;
-            font-size: 1rem;
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
-            overflow: hidden;
-
-            :deep() {
-                /*button按钮的 阴影样式可以直接使用*/
-                .custom-shadow {
-                    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
-                }
-            }
-
-            .page {
-                padding: 0 24rpx 48rpx;
+            .scrollTopHeigh {
+                /*在滚动区域内的, 可以自定义的高度*/
                 box-sizing: border-box;
+                height: $defaultTopHeight;
+                background-color: rgba(255, 255, 255, 0.05);
             }
 
-            /* 顶部导航栏 */
-            .navbar {
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                padding: 20rpx 0 24rpx;
-                position: sticky;
-                top: 0;
-                z-index: 10;
-                backdrop-filter: blur(20rpx);
-                background: rgba(255, 255, 255, 0.8);
 
-                .navbar-back {
-                    font-size: 48rpx;
-                    font-weight: 300;
-                    opacity: 0.7;
-                    padding: 10rpx;
+            .scrollViewHeigh {
+                /*滚动页面区域范围*/
+                box-sizing: border-box;
+                font-size: 1rem;
+                height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
+                overflow: hidden;
+
+                :deep() {
+                    /*button按钮的 阴影样式可以直接使用*/
+                    .custom-shadow {
+                        box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    }
                 }
 
-                .navbar-title {
-                    font-size: 36rpx;
-                    font-weight: 600;
+                .page {
+                    padding: 0 24rpx 48rpx;
+                    box-sizing: border-box;
                 }
 
-                .navbar-share {
-                    font-size: 36rpx;
-                    font-weight: 700;
-                    opacity: 0.5;
-                    padding: 10rpx;
+                /* 顶部导航栏 */
+                .navbar {
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    padding: 20rpx 0 24rpx;
+                    position: sticky;
+                    top: 0;
+                    z-index: 10;
+                    backdrop-filter: blur(20rpx);
+                    background: rgba(255, 255, 255, 0.8);
+
+                    .navbar-back {
+                        font-size: 48rpx;
+                        font-weight: 300;
+                        opacity: 0.7;
+                        padding: 10rpx;
+                    }
+
+                    .navbar-title {
+                        font-size: 36rpx;
+                        font-weight: 600;
+                    }
+
+                    .navbar-share {
+                        font-size: 36rpx;
+                        font-weight: 700;
+                        opacity: 0.5;
+                        padding: 10rpx;
+                    }
                 }
-            }
 
-            /* 快递信息卡片 */
-            .express-card {
-                background: rgba(128, 128, 128, 0.05);
-                border-radius: 28rpx;
-                padding: 28rpx;
-                margin-bottom: 24rpx;
+                /* 快递信息卡片 */
+                .express-card {
+                    background: rgba(128, 128, 128, 0.05);
+                    border-radius: 28rpx;
+                    padding: 28rpx;
+                    margin-bottom: 24rpx;
 
-                .express-header {
-                    margin-bottom: 20rpx;
+                    .express-header {
+                        margin-bottom: 20rpx;
 
-                    .express-company {
-                        display: flex;
-                        align-items: center;
-                        gap: 12rpx;
-                        margin-bottom: 12rpx;
-
-                        :deep(.custom-class-img) {
-                            width: 100%;
-                            height: 100%;
+                        .express-company {
                             display: flex;
-                            border-radius: 50%;
-                            justify-content: center;
                             align-items: center;
+                            gap: 12rpx;
+                            margin-bottom: 12rpx;
 
-                            .custom-image {
+                            :deep(.custom-class-img) {
                                 width: 100%;
                                 height: 100%;
+                                display: flex;
+                                border-radius: 50%;
+                                justify-content: center;
+                                align-items: center;
+
+                                .custom-image {
+                                    width: 100%;
+                                    height: 100%;
+                                }
+                            }
+
+                            .company-icon {
+                                font-size: 40rpx;
+                            }
+
+                            .company-name {
+                                font-size: 34rpx;
+                                font-weight: 630;
+                            }
+
+                            .company-status {
+                                font-size: 22rpx;
+                                padding: 4rpx 16rpx;
+                                border-radius: 20rpx;
+                                margin-left: auto;
+
+                                &.status-waiting {
+                                    background: rgba(255, 193, 67, 0.15);
+                                }
+
+                                &.status-transit {
+                                    background: rgba(33, 133, 243, 0.12);
+                                }
+
+                                &.status-delivering {
+                                    background: rgba(82, 196, 126, 0.12);
+                                }
+
+                                &.status-signed {
+                                    background: rgba(134, 142, 151, 0.12);
+                                }
                             }
                         }
 
-                        .company-icon {
-                            font-size: 40rpx;
-                        }
-
-                        .company-name {
-                            font-size: 34rpx;
-                            font-weight: 630;
-                        }
-
-                        .company-status {
-                            font-size: 22rpx;
-                            padding: 4rpx 16rpx;
-                            border-radius: 20rpx;
-                            margin-left: auto;
-
-                            &.status-waiting {
-                                background: rgba(255, 193, 67, 0.15);
-                            }
-
-                            &.status-transit {
-                                background: rgba(33, 133, 243, 0.12);
-                            }
-
-                            &.status-delivering {
-                                background: rgba(82, 196, 126, 0.12);
-                            }
-
-                            &.status-signed {
-                                background: rgba(134, 142, 151, 0.12);
-                            }
-                        }
-                    }
-
-                    .express-waybill {
-                        display: flex;
-                        //justify-content: center;
-                        align-items: center;
-                        font-size: 26rpx;
-                        opacity: 0.5;
-
-                        .express-waybill-copy {
-                            font-size: 22rpx;
-                            padding: 4rpx 16rpx;
-                            border-radius: 20rpx;
-                            margin-left: auto;
-                        }
-                    }
-                }
-
-                .express-divider {
-                    height: 1rpx;
-                    background: rgba(128, 128, 128, 0.1);
-                    margin: 16rpx 0;
-                }
-
-                .express-contact {
-                    display: flex;
-                    align-items: center;
-                    gap: 20rpx;
-                    margin-bottom: 16rpx;
-
-                    .contact-item {
-                        flex: 1;
-                        display: flex;
-                        flex-direction: column;
-                        gap: 6rpx;
-
-                        .contact-label {
-                            font-size: 22rpx;
-                            opacity: 0.4;
-                        }
-
-                        .contact-value {
-                            font-size: 30rpx;
-                            font-weight: 570;
-                        }
-
-                        .contact-phone {
+                        .express-waybill {
+                            display: flex;
+                            //justify-content: center;
+                            align-items: center;
                             font-size: 26rpx;
                             opacity: 0.5;
+
+                            .express-waybill-copy {
+                                font-size: 22rpx;
+                                padding: 4rpx 16rpx;
+                                border-radius: 20rpx;
+                                margin-left: auto;
+                            }
                         }
                     }
 
-                    .contact-arrow {
-                        font-size: 36rpx;
-                        opacity: 0.3;
-                        padding: 0 8rpx;
-                    }
-                }
-
-                .express-address {
-                    display: flex;
-                    align-items: flex-start;
-                    gap: 10rpx;
-                    padding-top: 12rpx;
-                    border-top: 1rpx solid rgba(128, 128, 128, 0.06);
-
-                    .address-icon {
-                        font-size: 28rpx;
-                        flex-shrink: 0;
-                        transform: translateY(-10rpx);
+                    .express-divider {
+                        height: 1rpx;
+                        background: rgba(128, 128, 128, 0.1);
+                        margin: 16rpx 0;
                     }
 
-                    .address-text {
-                        font-size: 26rpx;
-                        opacity: 0.65;
-                        line-height: 1.5;
-                    }
-                }
-            }
-
-            /* 物流状态提示 */
-            .status-notice {
-                display: flex;
-                align-items: flex-start;
-                gap: 16rpx;
-                padding: 24rpx;
-                border-radius: 20rpx;
-                margin-bottom: 28rpx;
-
-                //&.status-waiting {
-                //    // 物流状态 不同状态的 背景颜色
-                //    background: rgba(255, 248, 235, 0.8);
-                //}
-                //
-                //&.status-transit {
-                //    background: rgba(230, 244, 253, 0.8);
-                //}
-                //
-                //&.status-delivering {
-                //    background: rgba(236, 250, 242, 0.8);
-                //}
-                //
-                //&.status-signed {
-                //    background: rgba(245, 247, 249, 0.8);
-                //}
-
-                .notice-icon {
-                    font-size: 44rpx;
-                    flex-shrink: 0;
-                }
-
-                .notice-content {
-                    flex: 1;
-
-                    .notice-title {
-                        font-size: 30rpx;
-                        font-weight: 600;
-                        display: block;
-                        margin-bottom: 6rpx;
-                    }
-
-                    .notice-desc {
-                        font-size: 26rpx;
-                        opacity: 0.6;
-                        line-height: 1.5;
-                    }
-                }
-            }
-
-            /* 物流追踪标题 */
-            .tracking-header {
-                display: flex;
-                align-items: baseline;
-                gap: 16rpx;
-                margin-bottom: 28rpx;
-                padding: 0 8rpx;
-
-                .tracking-title {
-                    font-size: 36rpx;
-                    font-weight: 640;
-                }
-
-                .tracking-count {
-                    font-size: 24rpx;
-                    opacity: 0.4;
-                }
-            }
-
-            /* 时间轴容器 */
-            .timeline {
-                display: flex;
-                flex-direction: column;
-            }
-
-            /* 单个节点 */
-            .timeline-item {
-                // 物流状态的 每一行 盒子
-                display: flex;
-                padding-bottom: 32rpx;
-                /* 左侧时间轴区域 */
-                .timeline-left {
-                    // 物流状态的左侧的盒子
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                    width: 130rpx;
-                    flex-shrink: 0;
-                    margin-right: 20rpx;
-
-                    .dot-wrap {
+                    .express-contact {
                         display: flex;
-                        flex-direction: column;
                         align-items: center;
-                        height: 58rpx;
-                        //物流状态 上边的盒子,并且是 状态亮点盒子
-                        .dot {
-                            width: 18rpx;
-                            height: 18rpx;
-                            border-radius: 50%;
-                            background-color: #4cd964;
-                            opacity: 0.3;
-                            flex-shrink: 0;
-                            margin-top: 6rpx;
+                        gap: 20rpx;
+                        margin-bottom: 16rpx;
 
-                            &.dot-waiting {
-                                animation: pulse 2s infinite;
-                                //box-shadow: inset 0 0 0 1px red;
+                        .contact-item {
+                            flex: 1;
+                            display: flex;
+                            flex-direction: column;
+                            gap: 6rpx;
+
+                            .contact-label {
+                                font-size: 22rpx;
+                                opacity: 0.4;
+                            }
+
+                            .contact-value {
+                                font-size: 30rpx;
+                                font-weight: 570;
+                            }
+
+                            .contact-phone {
+                                font-size: 26rpx;
+                                opacity: 0.5;
                             }
                         }
 
-                        .line {
-                            width: 2rpx;
-                            flex: 1;
-                            background: currentColor;
-                            opacity: 0.1;
-                            margin-top: 6rpx;
+                        .contact-arrow {
+                            font-size: 36rpx;
+                            opacity: 0.3;
+                            padding: 0 8rpx;
                         }
                     }
 
-                    .time {
-                        font-size: 24rpx;
-                        font-weight: 580;
-                        opacity: 0.7;
-                        margin-top: 4rpx;
-                    }
+                    .express-address {
+                        display: flex;
+                        align-items: flex-start;
+                        gap: 10rpx;
+                        padding-top: 12rpx;
+                        border-top: 1rpx solid rgba(128, 128, 128, 0.06);
 
-                    .time-hour {
-                        font-size: 20rpx;
-                        opacity: 0.4;
-                        margin-top: 2rpx;
+                        .address-icon {
+                            font-size: 28rpx;
+                            flex-shrink: 0;
+                            transform: translateY(-10rpx);
+                        }
+
+                        .address-text {
+                            font-size: 26rpx;
+                            opacity: 0.65;
+                            line-height: 1.5;
+                        }
                     }
                 }
 
-                /* 最新节点高亮 */
-                &.is-latest {
+                /* 物流状态提示 */
+                .status-notice {
+                    display: flex;
+                    align-items: flex-start;
+                    gap: 16rpx;
+                    padding: 24rpx;
+                    border-radius: 20rpx;
+                    margin-bottom: 28rpx;
+
+                    //&.status-waiting {
+                    //    // 物流状态 不同状态的 背景颜色
+                    //    background: rgba(255, 248, 235, 0.8);
+                    //}
+                    //
+                    //&.status-transit {
+                    //    background: rgba(230, 244, 253, 0.8);
+                    //}
+                    //
+                    //&.status-delivering {
+                    //    background: rgba(236, 250, 242, 0.8);
+                    //}
+                    //
+                    //&.status-signed {
+                    //    background: rgba(245, 247, 249, 0.8);
+                    //}
+
+                    .notice-icon {
+                        font-size: 44rpx;
+                        flex-shrink: 0;
+                    }
+
+                    .notice-content {
+                        flex: 1;
+
+                        .notice-title {
+                            font-size: 30rpx;
+                            font-weight: 600;
+                            display: block;
+                            margin-bottom: 6rpx;
+                        }
+
+                        .notice-desc {
+                            font-size: 26rpx;
+                            opacity: 0.6;
+                            line-height: 1.5;
+                        }
+                    }
+                }
+
+                /* 物流追踪标题 */
+                .tracking-header {
+                    display: flex;
+                    align-items: baseline;
+                    gap: 16rpx;
+                    margin-bottom: 28rpx;
+                    padding: 0 8rpx;
+
+                    .tracking-title {
+                        font-size: 36rpx;
+                        font-weight: 640;
+                    }
+
+                    .tracking-count {
+                        font-size: 24rpx;
+                        opacity: 0.4;
+                    }
+                }
+
+                /* 时间轴容器 */
+                .timeline {
+                    display: flex;
+                    flex-direction: column;
+                }
+
+                /* 单个节点 */
+                .timeline-item {
+                    // 物流状态的 每一行 盒子
+                    display: flex;
+                    padding-bottom: 32rpx;
+                    /* 左侧时间轴区域 */
                     .timeline-left {
-                        .dot {
-                            opacity: 0.9;
-                            transform: scale(1.3);
+                        // 物流状态的左侧的盒子
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        width: 130rpx;
+                        flex-shrink: 0;
+                        margin-right: 20rpx;
+
+                        .dot-wrap {
+                            display: flex;
+                            flex-direction: column;
+                            align-items: center;
+                            height: 58rpx;
+                            //物流状态 上边的盒子,并且是 状态亮点盒子
+                            .dot {
+                                width: 18rpx;
+                                height: 18rpx;
+                                border-radius: 50%;
+                                background-color: #4cd964;
+                                opacity: 0.3;
+                                flex-shrink: 0;
+                                margin-top: 6rpx;
+
+                                &.dot-waiting {
+                                    animation: pulse 2s infinite;
+                                    //box-shadow: inset 0 0 0 1px red;
+                                }
+                            }
+
+                            .line {
+                                width: 2rpx;
+                                flex: 1;
+                                background: currentColor;
+                                opacity: 0.1;
+                                margin-top: 6rpx;
+                            }
                         }
 
                         .time {
-                            opacity: 1;
-                            font-weight: 670;
+                            font-size: 24rpx;
+                            font-weight: 580;
+                            opacity: 0.7;
+                            margin-top: 4rpx;
+                        }
+
+                        .time-hour {
+                            font-size: 20rpx;
+                            opacity: 0.4;
+                            margin-top: 2rpx;
                         }
                     }
 
+                    /* 最新节点高亮 */
+                    &.is-latest {
+                        .timeline-left {
+                            .dot {
+                                opacity: 0.9;
+                                transform: scale(1.3);
+                            }
+
+                            .time {
+                                opacity: 1;
+                                font-weight: 670;
+                            }
+                        }
+
+                        .timeline-right {
+                            .msg {
+                                font-weight: 610;
+                            }
+                        }
+                    }
+
+                    /* 右侧内容 */
                     .timeline-right {
+                        flex: 1;
+                        padding-top: 4rpx;
+
                         .msg {
-                            font-weight: 610;
+                            font-size: 30rpx;
+                            line-height: 1.5;
+                            margin-bottom: 6rpx;
+                        }
+
+                        .location {
+                            font-size: 24rpx;
+                            opacity: 0.45;
                         }
                     }
                 }
 
-                /* 右侧内容 */
-                .timeline-right {
-                    flex: 1;
-                    padding-top: 4rpx;
+                /* 等揽件状态专属提示 */
+                .waiting-tips {
+                    margin-top: 32rpx;
+                    padding: 24rpx;
+                    background: rgba(128, 128, 128, 0.03);
+                    border-radius: 20rpx;
 
-                    .msg {
-                        font-size: 30rpx;
-                        line-height: 1.5;
-                        margin-bottom: 6rpx;
-                    }
+                    .tip-item {
+                        display: flex;
+                        align-items: center;
+                        gap: 12rpx;
+                        padding: 12rpx 0;
 
-                    .location {
-                        font-size: 24rpx;
-                        opacity: 0.45;
+                        .tip-icon {
+                            font-size: 28rpx;
+                            flex-shrink: 0;
+                        }
+
+                        .tip-text {
+                            font-size: 26rpx;
+                            opacity: 0.6;
+                            line-height: 1.4;
+                        }
                     }
                 }
-            }
 
-            /* 等揽件状态专属提示 */
-            .waiting-tips {
-                margin-top: 32rpx;
-                padding: 24rpx;
-                background: rgba(128, 128, 128, 0.03);
-                border-radius: 20rpx;
-
-                .tip-item {
-                    display: flex;
-                    align-items: center;
-                    gap: 12rpx;
-                    padding: 12rpx 0;
-
-                    .tip-icon {
-                        font-size: 28rpx;
-                        flex-shrink: 0;
+                /* 脉冲动画 */
+                @keyframes pulse {
+                    0% {
+                        transform: scale(1);
+                        opacity: 0.3;
                     }
-
-                    .tip-text {
-                        font-size: 26rpx;
+                    50% {
+                        transform: scale(1.5);
                         opacity: 0.6;
-                        line-height: 1.4;
+                    }
+                    100% {
+                        transform: scale(1);
+                        opacity: 0.3;
                     }
                 }
+
+
             }
 
-            /* 脉冲动画 */
-            @keyframes pulse {
-                0% {
-                    transform: scale(1);
-                    opacity: 0.3;
-                }
-                50% {
-                    transform: scale(1.5);
-                    opacity: 0.6;
-                }
-                100% {
-                    transform: scale(1);
-                    opacity: 0.3;
-                }
+            .scrollBottomHeigh {
+                box-sizing: border-box;
+                height: $xiaoBottomHeigh;
+                @include line-color();
             }
 
-
         }
 
-        .scrollBottomHeigh {
-            box-sizing: border-box;
-            height: $xiaoBottomHeigh;
-            @include line-color();
-        }
+
     }
 </style>
 <template>
@@ -585,131 +595,141 @@
                         </template>
                     </ChildComScroll>
                 </view>
+                <view class="grit-content">
+                    <view class="scrollTopHeigh"><!--预留的空间高度--></view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
+                        <view class="line-widht-number" style="height: 10rpx"></view>
+                        <view class="page">
+                            <!-- 快递基本信息卡片 -->
+                            <view class="express-card">
+                                <view class="express-header">
+                                    <view class="express-company">
+                                        <wd-img custom-class="custom-class-img" custom-image="custom-image" :width="20"
+                                                :round="true"
+                                                :height="20" :webp="true"
+                                                src="https://hudie.xiao.band/ims.webp">
+                                            <template #error>
+                                                <view class="error-wrap">加载失败</view>
+                                            </template>
+                                            <template #loading>
+                                                <view class="loading-wrap">
+                                                    <wd-loading/>
+                                                </view>
+                                            </template>
+                                        </wd-img>
+                                        <text class="company-name">{{ logisticsInfo.deliveryName }}</text>
+                                        <view class="company-status" :class="getStatusClass">
+                                            {{ current当前物流数据?.text }}
+                                        </view>
+                                    </view>
+                                    <view class="express-waybill">
+                                        <view class="express-waybill-text"> 运单号：{{ logisticsInfo.waybillId }}</view>
+                                        <view class="express-waybill-copy" @click="复制物流运单号"> 复制</view>
+                                    </view>
+                                </view>
+                                <!--空格-->
+                                <view class="express-divider"></view>
+                                <!--寄件人,发件人的信息-->
+                                <view class="express-contact">
+                                    <view class="contact-item">
+                                        <text class="contact-label">寄件人</text>
+                                        <text class="contact-value">{{ logisticsInfo.sender.name }}</text>
+                                        <text class="contact-phone">{{ logisticsInfo.sender.phone }}</text>
+                                    </view>
+                                    <view class="contact-arrow">›</view>
+                                    <view class="contact-item">
+                                        <text class="contact-label">收件人</text>
+                                        <text class="contact-value">
+                                            {{ xiaoMain.emsOrder订单?.order用户配送地址?.address?.userName }}
+                                        </text>
+                                        <text class="contact-phone">
+                                            {{
+                                                xiaoMain.emsOrder订单?.order用户配送地址?.address?.telNumber?.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
+                                            }}
+                                        </text>
+                                    </view>
+                                </view>
+                                <!--收件人的地址详细信息-->
+                                <view class="express-address">
+                                    <text class="address-icon">📍</text>
+                                    <text class="address-text">{{ logisticsInfo.receiver.address }}</text>
+                                </view>
+                            </view>
+
+                            <!-- 物流状态提示 -->
+                            <view class="status-notice" :class="getStatusClass">
+                                <view class="notice-icon">{{ current当前物流数据?.icon }}</view>
+                                <view class="notice-content">
+                                    <text class="notice-title">{{ current当前物流数据?.title }}</text>
+                                    <text class="notice-desc">{{ current当前物流数据?.desc }}</text>
+                                </view>
+                            </view>
+
+                            <!-- 物流追踪标题 -->
+                            <view class="tracking-header">
+                                <text class="tracking-title">物流追踪</text>
+                                <text class="tracking-count">共 {{
+                                        xiaoMain.emsOrder订单?.order物流数据?.path_item_num
+                                    }}
+                                    条记录
+                                </text>
+                            </view>
+
+                            <!-- 物流时间轴 -->
+                            <view class="timeline">
+                                <view class="timeline-item" v-for="(item, index) in 物流数据?.path_item_list"
+                                      :key="index"
+                                      :class="{ 'is-latest': index === 0 }">
+                                    <!-- 左侧时间轴 -->
+                                    <view class="timeline-left">
+                                        <view class="dot-wrap">
+                                            <view class="dot"
+                                                  :class="{ 'dot-waiting': index === 0 }"></view>
+                                            <view class="line"
+                                                  v-if="index !== 物流数据?.path_item_list.length! - 1"></view>
+                                        </view>
+                                        <view class="time">{{ dayjs.unix(item.action_time).format("MM/DD") }}</view>
+                                        <view class="time-hour">{{
+                                                dayjs.unix(item.action_time).format("HH:mm")
+                                            }}
+                                        </view>
+                                    </view>
+
+                                    <!-- 右侧内容 -->
+                                    <view class="timeline-right">
+                                        <view class="msg">{{ item.action_msg }}</view>
+                                    </view>
+                                </view>
+                            </view>
+
+                            <!-- 等揽件状态专属提示 -->
+                            <view class="waiting-tips" v-if="isWaitingPickup">
+                                <view class="tip-item">
+                                    <text class="tip-icon">⏰</text>
+                                    <text class="tip-text">商家正在准备商品，请耐心等待</text>
+                                </view>
+                                <view class="tip-item">
+                                    <text class="tip-icon">📞</text>
+                                    <text class="tip-text">如需催单请联系商家或快递公司</text>
+                                </view>
+                                <view class="tip-item">
+                                    <text class="tip-icon">🔄</text>
+                                    <text class="tip-text">页面将自动刷新最新物流状态</text>
+                                </view>
+                            </view>
+                        </view>
+
+                    </scroll-view>
+
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域--></view>
+                    <wd-toast selector="default-toast"/>
+                    <wd-message-box selector="default-message-box"/>
+                </view>
                 <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度--></view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
-                    <view class="line-widht-number" style="height: 10rpx"></view>
-                    <view class="page">
-                        <!-- 快递基本信息卡片 -->
-                        <view class="express-card">
-                            <view class="express-header">
-                                <view class="express-company">
-                                    <wd-img custom-class="custom-class-img" custom-image="custom-image" :width="20"
-                                            :round="true"
-                                            :height="20" :webp="true"
-                                            src="https://hudie.xiao.band/ims.webp">
-                                        <template #error>
-                                            <view class="error-wrap">加载失败</view>
-                                        </template>
-                                        <template #loading>
-                                            <view class="loading-wrap">
-                                                <wd-loading/>
-                                            </view>
-                                        </template>
-                                    </wd-img>
-                                    <text class="company-name">{{ logisticsInfo.deliveryName }}</text>
-                                    <view class="company-status" :class="getStatusClass">
-                                        {{ current当前物流数据?.text }}
-                                    </view>
-                                </view>
-                                <view class="express-waybill">
-                                    <view class="express-waybill-text"> 运单号：{{ logisticsInfo.waybillId }}</view>
-                                    <view class="express-waybill-copy" @click="复制物流运单号"> 复制</view>
-                                </view>
-                            </view>
-                            <!--空格-->
-                            <view class="express-divider"></view>
-                            <!--寄件人,发件人的信息-->
-                            <view class="express-contact">
-                                <view class="contact-item">
-                                    <text class="contact-label">寄件人</text>
-                                    <text class="contact-value">{{ logisticsInfo.sender.name }}</text>
-                                    <text class="contact-phone">{{ logisticsInfo.sender.phone }}</text>
-                                </view>
-                                <view class="contact-arrow">›</view>
-                                <view class="contact-item">
-                                    <text class="contact-label">收件人</text>
-                                    <text class="contact-value">
-                                        {{ xiaoMain.emsOrder订单?.order用户配送地址?.address?.userName }}
-                                    </text>
-                                    <text class="contact-phone">
-                                        {{
-                                            xiaoMain.emsOrder订单?.order用户配送地址?.address?.telNumber?.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
-                                        }}
-                                    </text>
-                                </view>
-                            </view>
-                            <!--收件人的地址详细信息-->
-                            <view class="express-address">
-                                <text class="address-icon">📍</text>
-                                <text class="address-text">{{ logisticsInfo.receiver.address }}</text>
-                            </view>
-                        </view>
 
-                        <!-- 物流状态提示 -->
-                        <view class="status-notice" :class="getStatusClass">
-                            <view class="notice-icon">{{ current当前物流数据?.icon }}</view>
-                            <view class="notice-content">
-                                <text class="notice-title">{{ current当前物流数据?.title }}</text>
-                                <text class="notice-desc">{{ current当前物流数据?.desc }}</text>
-                            </view>
-                        </view>
-
-                        <!-- 物流追踪标题 -->
-                        <view class="tracking-header">
-                            <text class="tracking-title">物流追踪</text>
-                            <text class="tracking-count">共 {{ xiaoMain.emsOrder订单?.order物流数据?.path_item_num }}
-                                条记录
-                            </text>
-                        </view>
-
-                        <!-- 物流时间轴 -->
-                        <view class="timeline">
-                            <view class="timeline-item" v-for="(item, index) in 物流数据?.path_item_list" :key="index"
-                                  :class="{ 'is-latest': index === 0 }">
-                                <!-- 左侧时间轴 -->
-                                <view class="timeline-left">
-                                    <view class="dot-wrap">
-                                        <view class="dot"
-                                              :class="{ 'dot-waiting': index === 0 }"></view>
-                                        <view class="line" v-if="index !== 物流数据?.path_item_list.length! - 1"></view>
-                                    </view>
-                                    <view class="time">{{ dayjs.unix(item.action_time).format("MM/DD") }}</view>
-                                    <view class="time-hour">{{ dayjs.unix(item.action_time).format("HH:mm") }}</view>
-                                </view>
-
-                                <!-- 右侧内容 -->
-                                <view class="timeline-right">
-                                    <view class="msg">{{ item.action_msg }}</view>
-                                </view>
-                            </view>
-                        </view>
-
-                        <!-- 等揽件状态专属提示 -->
-                        <view class="waiting-tips" v-if="isWaitingPickup">
-                            <view class="tip-item">
-                                <text class="tip-icon">⏰</text>
-                                <text class="tip-text">商家正在准备商品，请耐心等待</text>
-                            </view>
-                            <view class="tip-item">
-                                <text class="tip-icon">📞</text>
-                                <text class="tip-text">如需催单请联系商家或快递公司</text>
-                            </view>
-                            <view class="tip-item">
-                                <text class="tip-icon">🔄</text>
-                                <text class="tip-text">页面将自动刷新最新物流状态</text>
-                            </view>
-                        </view>
-                    </view>
-
-                </scroll-view>
-
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域--></view>
-                <wd-toast selector="default-toast"/>
-                <wd-message-box selector="default-message-box"/>
             </view>
         </wd-config-provider>
     </view>
diff --git a/src/subPackages/homeSubPages/用户积分页面/用户积分页面.vue b/src/subPackages/homeSubPages/用户积分页面/用户积分页面.vue
index e4af52d..b834812 100644
--- a/src/subPackages/homeSubPages/用户积分页面/用户积分页面.vue
+++ b/src/subPackages/homeSubPages/用户积分页面/用户积分页面.vue
@@ -91,7 +91,7 @@
 
 
         .grit-content {
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight));
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
             display: grid;
             grid-template-columns: 1fr;
             grid-auto-rows: auto 1fr auto;
diff --git a/src/subPackages/homeSubPages/用户配送地址页面/用户配送地址页面.vue b/src/subPackages/homeSubPages/用户配送地址页面/用户配送地址页面.vue
index c2614df..af55b8d 100644
--- a/src/subPackages/homeSubPages/用户配送地址页面/用户配送地址页面.vue
+++ b/src/subPackages/homeSubPages/用户配送地址页面/用户配送地址页面.vue
@@ -3,21 +3,6 @@
     $defaultTopHeight: 1px; // 滚动区域外 可以预留的高度
     $xiaoBottomHeigh: 100rpx; // 滚动区域外,可以预留的高度
     /* 浅色模式 */
-    //@media (prefers-color-scheme: light) {
-    //    .phone-screen {
-    //        color: white;
-    //        background: #181818;
-    //    }
-    //}
-    //
-    ///* 深色模式 */
-    //@media (prefers-color-scheme: dark) {
-    //    .phone-screen {
-    //        color: white;
-    //        background: #1a1a1a;
-    //    }
-    //}
-
 
     @mixin line-color {
         @keyframes gradientFlow {
@@ -115,6 +100,13 @@
             background-color: rgba(255, 255, 255, 0.05);
         }
 
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
+            box-sizing: border-box;
+        }
 
         .scrollViewHeigh {
             /*滚动页面区域范围*/
@@ -135,10 +127,8 @@
 
         .scrollBottomHeigh {
             box-sizing: border-box;
-            height: $xiaoBottomHeigh;
             display: flex;
             align-items: flex-end;
-            //@include line-color();
         }
     }
 </style>
@@ -164,23 +154,26 @@
                         </template>
                     </ChildComScroll>
                 </view>
-                <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度--></view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
-                    <!--                    页面地址为空时显示的组件-->
-                    <address-com-empty v-if="xiaoMain.addressDataList.length===0"></address-com-empty>
-                    <address-com-list v-if="xiaoMain.addressDataList.length>0"></address-com-list>
+                <view class="grit-content">
+                    <!--分隔线,上面的是子组件-->
+                    <view class="scrollTopHeigh"><!--预留的空间高度--></view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
+                        <!--                    页面地址为空时显示的组件-->
+                        <address-com-empty v-if="xiaoMain.addressDataList.length===0"></address-com-empty>
+                        <address-com-list v-if="xiaoMain.addressDataList.length>0"></address-com-list>
 
-                </scroll-view>
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域-->
-                    <address-com-add-new-address
-                        v-if="xiaoMain.addressDataList.length!==0"></address-com-add-new-address>
+                    </scroll-view>
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域-->
+                        <address-com-add-new-address
+                            v-if="xiaoMain.addressDataList.length!==0"></address-com-add-new-address>
+                    </view>
+                    <wd-toast selector="default-toast"/>
+                    <wd-message-box selector="default-message-box"/>
                 </view>
-                <wd-toast selector="default-toast"/>
-                <wd-message-box selector="default-message-box"/>
+
             </view>
         </wd-config-provider>
     </view>
diff --git a/src/subPackages/homeSubPages/订单数据页面/订单数据页面.vue b/src/subPackages/homeSubPages/订单数据页面/订单数据页面.vue
index 5165fd1..3596898 100644
--- a/src/subPackages/homeSubPages/订单数据页面/订单数据页面.vue
+++ b/src/subPackages/homeSubPages/订单数据页面/订单数据页面.vue
@@ -105,53 +105,62 @@
             }
         }
 
-
-        .scrollTopHeigh {
-            /*在滚动区域内的, 可以自定义的高度*/
+        .grit-content {
+            height: calc(v-bind(pxWindowHeight) - v-bind(statusHeight));
+            display: grid;
+            grid-template-columns: 1fr;
+            grid-auto-rows: auto 1fr auto;
             box-sizing: border-box;
-            height: $defaultTopHeight;
 
-            :deep(.custom-class-tabbar) {
-                //box-shadow:inset 0 3px 1px -2px  rgb(0 0 0 / 20%) , 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
-                //box-shadow: inset 0 2px 1px -2px rgb(0 0 0 / 15%),
-                //inset 0 2px 2px 0 rgb(0 0 0 / 14%),
-                //inset 0 1px 5px 0 rgb(0 0 0 / 14%),
-                //inset 1px 1px 2px rgb(0 0 0 / 14%),
-                //inset -1px -1px 2px rgb(0 0 0 / 14%);
-                //box-shadow: inset 2px 2px 5px #bcbcbc, inset -2px -2px 5px #ffffff, 2px 2px 5px #bcbcbc, -2px -2px 5px #ffffff;
-                box-shadow: /* 上 - 向下凹 */
-                    inset 0 3px 2px -2px rgba(0, 0, 0, 0.3), /* 上 */
-                    inset 0 -3px 2px -2px rgba(0, 0, 0, 0.3), /* 下 */
-                    inset 3px 0 2px -2px rgba(0, 0, 0, 0.3), /* 左 */
-                    inset -3px 0 2px -2px rgba(0, 0, 0, 0.3); /* 右 */
-                //    box-shadow: inset X Y blur spread color
-            }
-        }
+            .scrollTopHeigh {
+                /*在滚动区域内的, 可以自定义的高度*/
+                box-sizing: border-box;
+                height: $defaultTopHeight;
 
-
-        .scrollViewHeigh {
-            /*滚动页面区域范围*/
-            box-sizing: border-box;
-            font-size: 1rem;
-            height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
-            overflow: hidden;
-
-
-            :deep() {
-                /*button按钮的 阴影样式可以直接使用*/
-                .custom-shadow {
-                    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                :deep(.custom-class-tabbar) {
+                    //box-shadow:inset 0 3px 1px -2px  rgb(0 0 0 / 20%) , 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    //box-shadow: inset 0 2px 1px -2px rgb(0 0 0 / 15%),
+                    //inset 0 2px 2px 0 rgb(0 0 0 / 14%),
+                    //inset 0 1px 5px 0 rgb(0 0 0 / 14%),
+                    //inset 1px 1px 2px rgb(0 0 0 / 14%),
+                    //inset -1px -1px 2px rgb(0 0 0 / 14%);
+                    //box-shadow: inset 2px 2px 5px #bcbcbc, inset -2px -2px 5px #ffffff, 2px 2px 5px #bcbcbc, -2px -2px 5px #ffffff;
+                    box-shadow: /* 上 - 向下凹 */
+                        inset 0 3px 2px -2px rgba(0, 0, 0, 0.3), /* 上 */
+                        inset 0 -3px 2px -2px rgba(0, 0, 0, 0.3), /* 下 */
+                        inset 3px 0 2px -2px rgba(0, 0, 0, 0.3), /* 左 */
+                        inset -3px 0 2px -2px rgba(0, 0, 0, 0.3); /* 右 */
+                    //    box-shadow: inset X Y blur spread color
                 }
             }
 
 
+            .scrollViewHeigh {
+                /*滚动页面区域范围*/
+                box-sizing: border-box;
+                font-size: 1rem;
+                height: calc(v-bind(pxScrollHeight) - v-bind(statusHeight) - #{$defaultTopHeight} - #{$xiaoBottomHeigh});
+                overflow: hidden;
+
+
+                :deep() {
+                    /*button按钮的 阴影样式可以直接使用*/
+                    .custom-shadow {
+                        box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+                    }
+                }
+
+
+            }
+
+            .scrollBottomHeigh {
+                box-sizing: border-box;
+                height: $xiaoBottomHeigh;
+                @include line-color();
+            }
+
         }
 
-        .scrollBottomHeigh {
-            box-sizing: border-box;
-            height: $xiaoBottomHeigh;
-            @include line-color();
-        }
     }
 </style>
 <template>
@@ -176,49 +185,52 @@
                         </template>
                     </ChildComScroll>
                 </view>
-                <!--分隔线,上面的是子组件-->
-                <view class="scrollTopHeigh"><!--预留的空间高度-->
-                    <wd-tabbar v-model="tabbar" custom-class="custom-class-tabbar" shape="round"
-                               :bordered="true" activeColor="#f0883a" @change="选中的标签事件">
-                        <wd-tabbar-item title="待揽件" :value="待揽件数量">
-                            <template #icon>
-                                <wd-icon classPrefix="xiaozizi" name="daiqueren" :size="22"
-                                         :color="tabbar===0?'#f0883a':''"/>
+                <view class="grit-content">
+                    <!--分隔线,上面的是子组件-->
+                    <view class="scrollTopHeigh"><!--预留的空间高度-->
+                        <wd-tabbar v-model="tabbar" custom-class="custom-class-tabbar" shape="round"
+                                   :bordered="true" activeColor="#f0883a" @change="选中的标签事件">
+                            <wd-tabbar-item title="待揽件" :value="待揽件数量">
+                                <template #icon>
+                                    <wd-icon classPrefix="xiaozizi" name="daiqueren" :size="22"
+                                             :color="tabbar===0?'#f0883a':''"/>
 
-                            </template>
-                        </wd-tabbar-item>
-                        <wd-tabbar-item title="待收货" :value="待收货数量">
-                            <template #icon>
-                                <wd-icon classPrefix="xiaozizi" name="peisongzhong1" :size="22"
-                                         :color="tabbar===1?'#f0883a':''"/>
-                            </template>
-                        </wd-tabbar-item>
-                        <wd-tabbar-item title="待评价" :value="待评价数量">
-                            <template #icon>
-                                <wd-icon classPrefix="xiaozizi" name="daipingjia1" :size="22"
-                                         :color="tabbar===2?'#f0883a':''"/>
-                            </template>
-                        </wd-tabbar-item>
-                        <wd-tabbar-item title="全部订单">
-                            <template #icon>
-                                <wd-icon classPrefix="wd-icon" name="app" :size="22"
-                                         :color="tabbar===3?'#f0883a':''"/>
-                            </template>
-                        </wd-tabbar-item>
-                    </wd-tabbar>
+                                </template>
+                            </wd-tabbar-item>
+                            <wd-tabbar-item title="待收货" :value="待收货数量">
+                                <template #icon>
+                                    <wd-icon classPrefix="xiaozizi" name="peisongzhong1" :size="22"
+                                             :color="tabbar===1?'#f0883a':''"/>
+                                </template>
+                            </wd-tabbar-item>
+                            <wd-tabbar-item title="待评价" :value="待评价数量">
+                                <template #icon>
+                                    <wd-icon classPrefix="xiaozizi" name="daipingjia1" :size="22"
+                                             :color="tabbar===2?'#f0883a':''"/>
+                                </template>
+                            </wd-tabbar-item>
+                            <wd-tabbar-item title="全部订单">
+                                <template #icon>
+                                    <wd-icon classPrefix="wd-icon" name="app" :size="22"
+                                             :color="tabbar===3?'#f0883a':''"/>
+                                </template>
+                            </wd-tabbar-item>
+                        </wd-tabbar>
+                    </view>
+                    <!-- 滚动区域开始-->
+                    <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
+                                 class="scrollViewHeigh">
+                        <view class="line-widht-number" style="height: 10rpx"></view>
+                        <order-com-empty v-if="isEmpty===0"></order-com-empty>
+                        <order-com-list-data v-model:modelValue="tabbar" v-if="isEmpty>0"
+                                             :order_list_data="order_list_data ?? []"></order-com-list-data>
+                    </scroll-view>
+                    <!--滚动区域结束-->
+                    <view class="scrollBottomHeigh"><!--底部预留区域--></view>
+                    <wd-toast selector="default-toast"/>
+                    <wd-message-box selector="default-message-box"/>
                 </view>
-                <!-- 滚动区域开始-->
-                <scroll-view :enableBackToTop="true" :enhanced="true" :scroll-y="true" :showScrollbar="false"
-                             class="scrollViewHeigh">
-                    <view class="line-widht-number" style="height: 10rpx"></view>
-                    <order-com-empty v-if="isEmpty===0"></order-com-empty>
-                    <order-com-list-data v-model:modelValue="tabbar" v-if="isEmpty>0"
-                                         :order_list_data="order_list_data ?? []"></order-com-list-data>
-                </scroll-view>
-                <!--滚动区域结束-->
-                <view class="scrollBottomHeigh"><!--底部预留区域--></view>
-                <wd-toast selector="default-toast"/>
-                <wd-message-box selector="default-message-box"/>
+
             </view>
         </wd-config-provider>
     </view>