From 159efd166a525e54a77dedf2cb6ce6dd60bc81a2 Mon Sep 17 00:00:00 2001
From: xiebing <xiebing@zkr.com>
Date: Mon, 15 Dec 2025 15:40:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Intendedposition/Intendedposition.vue     | 38 +++++++++++++------
 packageA/pages/reservation/reservation.vue    | 21 ++++++++--
 pages.json                                    |  6 ++-
 pages/nearby/components/one.vue               |  6 +--
 4 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/packageA/pages/Intendedposition/Intendedposition.vue b/packageA/pages/Intendedposition/Intendedposition.vue
index f616aa3..471db88 100644
--- a/packageA/pages/Intendedposition/Intendedposition.vue
+++ b/packageA/pages/Intendedposition/Intendedposition.vue
@@ -1,14 +1,21 @@
 <template>
-    <view class="collection-content">
-        <renderDeliveryRecord
-            v-if="pageState.list.length"
-            seeDate="applyTime"
-            :list="pageState.list"
-            :longitude="longitudeVal"
-            :latitude="latitudeVal"
-        ></renderDeliveryRecord>
-        <empty v-else :is-position="true"></empty>
-    </view>
+    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false">
+            <template #headerleft v-if="isMiniProgram">
+                <view class="btnback">
+                    <image src="@/static/icon/back.png" @click="navBack"></image>
+                </view>
+            </template>
+                <view class="collection-content">
+            <renderDeliveryRecord
+                v-if="pageState.list.length"
+                seeDate="applyTime"
+                :list="pageState.list"
+                :longitude="longitudeVal"
+                :latitude="latitudeVal"
+            ></renderDeliveryRecord>
+            <empty v-else :is-position="true"></empty>
+        </view>
+    </AppLayout>
 </template>
 
 <script setup>
@@ -16,7 +23,7 @@ import dictLabel from '@/components/dict-Label/dict-Label.vue';
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
 import useUserStore from '@/stores/useUserStore';
-const { $api, navTo, vacanciesTo } = inject('globalFunction');
+const { $api, navTo, vacanciesTo ,navBack} = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
@@ -83,11 +90,18 @@ function getJobList(type = 'add') {
 </script>
 
 <style lang="stylus" scoped>
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
 .collection-content{
     padding: 1rpx 28rpx 20rpx 28rpx;
     background: #F4F4F4;
     height: 100%;
-    min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     position: relative;
 }
 </style>
diff --git a/packageA/pages/reservation/reservation.vue b/packageA/pages/reservation/reservation.vue
index 7e0d9bd..41b0f88 100644
--- a/packageA/pages/reservation/reservation.vue
+++ b/packageA/pages/reservation/reservation.vue
@@ -1,5 +1,11 @@
 <template>
-    <view class="reser-content">
+    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false">
+            <template #headerleft v-if="isMiniProgram">
+                <view class="btnback">
+                    <image src="@/static/icon/back.png" @click="navBack"></image>
+                </view>
+            </template>
+                <view class="reser-content">
         <view class="content-top">
             <view
                 class="top-item"
@@ -50,12 +56,13 @@
             </scroll-view>
         </view>
     </view>
+    </AppLayout>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+const { $api, navTo, debounce, customSystem ,navBack} = inject('globalFunction');
 import Countdown from './component/countdown.vue';
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
@@ -155,9 +162,17 @@ function getList(type = 'add', loading = true) {
 </script>
 
 <style lang="stylus" scoped>
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
 .reser-content{
     width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    height:100%;
     display: flex;
     flex-direction: column;
     .content-top{
diff --git a/pages.json b/pages.json
index 87bf1ee..63ec104 100644
--- a/pages.json
+++ b/pages.json
@@ -126,7 +126,8 @@
                 "path": "pages/Intendedposition/Intendedposition",
                 "style": {
                     "navigationBarTitleText": "投递记录",
-                    "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
@@ -184,7 +185,8 @@
                 "path": "pages/reservation/reservation",
                 "style": {
                     "navigationBarTitleText": "我的预约",
-                    "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
diff --git a/pages/nearby/components/one.vue b/pages/nearby/components/one.vue
index 2238312..942282c 100644
--- a/pages/nearby/components/one.vue
+++ b/pages/nearby/components/one.vue
@@ -2,7 +2,7 @@
     <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
         <view class="nearby-map" @touchmove.stop.prevent>
             <map
-                style="width: 100%; height: 400px"
+                style="width: 100%; height:410rpx "
                 :latitude="latitudeVal"
                 :longitude="longitudeVal"
                 :markers="mapCovers"
@@ -362,11 +362,11 @@ defineExpose({ loadData, handleFilterConfirm });
     height: 100%;
     background: #f4f4f4;
     .nearby-map
-        height: 767rpx;
+        height: 400rpx;
         background: #e8e8e8;
         overflow: hidden
 .nearby-list
-    min-height: calc(100% - 384rpx)
+    min-height: calc(100% - 400rpx)
     background: #f4f4f4
     display: flex;
     flex-direction: column;