Merge branch 'main-ALL-IN-ONE' of http://124.243.245.42:3000/sdz/qingdao-employment-service into main-ALL-IN-ONE

packageA/pages/Intendedposition/Intendedposition.vue

@@ -1,12 +1,12 @@
 <template>
-    <AppLayout title="投递记录" :use-scroll-view="true" :show-bg-image="false" @onScrollBottom="getJobList">
+    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false" @onScrollBottom="getJobList()">
-            <template #headerleft v-if="isMiniProgram">
+        <template #headerleft v-if="isMiniProgram">
-                <view class="btnback">
+            <view class="btnback">
-                    <image src="@/static/icon/back.png" @click="navBack"></image>
+                <image src="@/static/icon/back.png" @click="navBack"></image>
-                </view>
+            </view>
-            </template>
+        </template>
-            <view class="collection-content">
+        <view class="collection-content">
-                <renderDeliveryRecord
+            <renderDeliveryRecord
                 v-if="pageState.list.length"
                 seeDate="applyTime"
                 :list="pageState.list"
@@ -23,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 ,navBack} = inject('globalFunction');
+const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
@@ -45,15 +45,6 @@ onLoad(() => {
     getJobList();
 });
 
-onMounted(() => {
-    // #ifdef H5
-    if (!isMiniProgram.value) {
-        const a = document.getElementsByClassName('uni-page-head-hd')[0];
-        a.style.display = 'none';
-    }
-    // #endif
-});
-
 
 
 function getJobList(type = 'add') {

packageA/pages/newJobPosition/newJobPosition.vue

@@ -1,30 +1,30 @@
 <template>
     <AppLayout title="新职位推荐" :use-scroll-view="false" :show-bg-image="false">
-                <template #headerleft v-if="isMiniProgram">
+        <template #headerleft v-if="isMiniProgram">
-                    <view class="btnback">
+            <view class="btnback">
-                        <image src="@/static/icon/back.png" @click="navBack"></image>
+                <image src="@/static/icon/back.png" @click="navBack"></image>
-                    </view>
-                </template>
-                <view class="reser-content">
-            <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-            <view class="content-top">
-                <view
-                    class="top-item button-click"
-                    :class="{ active: state.tabIndex === 'all' }"
-                    @click="changeOption('all')"
-                >
-                    全部
-                </view>
-                <view
-                    class="top-item button-click"
-                    :class="{ active: state.tabIndex === index }"
-                    v-for="(item, index) in userInfo.jobTitle"
-                    :key="index"
-                    @click="changeOption(index)"
-                >
-                    {{ item }}
-                </view>
             </view>
+        </template>
+        <view class="reser-content">
+            <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                <view class="content-top">
+                    <view
+                        class="top-item button-click"
+                        :class="{ active: state.tabIndex === 'all' }"
+                        @click="changeOption('all')"
+                    >
+                        全部
+                    </view>
+                    <view
+                        class="top-item button-click"
+                        :class="{ active: state.tabIndex === index }"
+                        v-for="(item, index) in userInfo.jobTitle"
+                        :key="index"
+                        @click="changeOption(index)"
+                    >
+                        {{ item }}
+                    </view>
+                </view>
             </scroll-view>
             <view class="main">
                 <scroll-view class="scroll-view" scroll-y @scrolltolower="scrollBottom">
@@ -45,7 +45,7 @@
 <script setup>
 import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, navTo, debounce, customSystem ,navBack} = inject('globalFunction');
+const { $api, navTo, debounce, customSystem, navBack } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
 import useUserStore from '@/stores/useUserStore';
@@ -65,15 +65,6 @@ const state = reactive({
     tabIndex: 'all',
 });
 
-onMounted(() => {
-    // #ifdef H5
-    if (!isMiniProgram.value) {
-        const a = document.getElementsByClassName('uni-page-head-hd')[0];
-        a.style.display = 'none';
-    }
-    // #endif
-});
-
 onLoad(() => {
     getList('refresh');
 });

packageA/pages/reservation/reservation.vue

@@ -44,25 +44,25 @@
                                         :blat="latitudeVal"
                                         :blong="longitudeVal"
                                     ></convert-distance> -->
+                                    </view>
                                 </view>
                             </view>
-                        </view>
+                            <view class="footer" v-if="isTimePassed(item.zphjbsj)">
-                        <view class="footer" v-if="isTimePassed(item.zphjbsj)">
+                                <view class="card_cancel" @click="updateCancel(item)">取消预约</view>
-                            <view class="card_cancel" @click="updateCancel(item)">取消预约</view>
+                            </view>
                         </view>
                     </view>
-                </view>
+                    <empty v-if="!pageState.list.length"></empty>
-                <empty v-if="!pageState.list.length"></empty>
+                </scroll-view>
-            </scroll-view>
+            </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 ,navBack} = 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';
@@ -99,15 +99,6 @@ onLoad(() => {
     getList();
 });
 
-onMounted(() => {
-    // #ifdef H5
-    if (!isMiniProgram.value) {
-        const a = document.getElementsByClassName('uni-page-head-hd')[0];
-        a.style.display = 'none';
-    }
-    // #endif
-});
-
 function chnageRanOption(item) {
     ranItem.value = item;
     getList('refresh');