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,5 +1,5 @@
 <template>
-    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false">
+    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false" @onScrollBottom="getJobList()">
         <template #headerleft v-if="isMiniProgram">
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
@@ -12,7 +12,7 @@
                 :list="pageState.list"
                 :longitude="longitudeVal"
                 :latitude="latitudeVal"
-            ></renderDeliveryRecord>
+                ></renderDeliveryRecord>
             <empty v-else :is-position="true"></empty>
         </view>
     </AppLayout>
@@ -45,9 +45,7 @@ onLoad(() => {
     getJobList();
 });
 
-onReachBottom(() => {
+
-    getJobList();
-});
 
 function getJobList(type = 'add') {
     if (type === 'refresh') {

packageA/pages/moreJobs/moreJobs.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false">
+    <AppLayout title="投递记录" :use-scroll-view="false" :show-bg-image="false" @onScrollBottom="loadMore">
         <template #headerleft v-if="isMiniProgram">
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
@@ -65,9 +65,6 @@ function removeNullProperties(obj) {
     return obj;
 }
 
-onReachBottom(() => {
-    loadMore();
-});
 </script>
 
 <style lang="stylus" scoped>

packageA/pages/reservation/reservation.vue

@@ -1,44 +1,44 @@
 <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">
-            <view class="content-top">
-                <view
-                    class="top-item"
-                    :class="{ active: ranItem.value === item.value }"
-                    v-for="(item, index) in ranOptions"
-                    :key="index"
-                    @click="chnageRanOption(item)"
-                >
-                    {{ item.label }}
                 </view>
+            </template>
+                <view class="reser-content">
+        <view class="content-top">
+            <view
+                class="top-item"
+                :class="{ active: ranItem.value === item.value }"
+                v-for="(item, index) in ranOptions"
+                :key="index"
+                @click="chnageRanOption(item)"
+            >
+                {{ item.label }}
             </view>
-            <view class="main">
+        </view>
-                <scroll-view class="height-100" scroll-y>
+        <view class="main">
-                    <view>
+            <scroll-view class="height-100" scroll-y  @scrolltolower="getList('add')">
-                        <view class="card" v-for="(item, index) in pageState.list" :key="index">
+                <view>
-                            <view
+                    <view class="card" v-for="(item, index) in pageState.list" :key="index">
-                                @click="
+                        <view
-                                    navTo(
+                            @click="
-                                        '/packageA/pages/exhibitors/exhibitors?jobFairId=' +
+                                navTo(
-                                            item.zphID +
+                                    '/packageA/pages/exhibitors/exhibitors?jobFairId=' +
-                                            '&jobFairName=' +
+                                        item.zphID +
-                                            item.zphmc
+                                        '&jobFairName=' +
-                                    )
+                                        item.zphmc
-                                "
+                                )
-                            >
+                            "
-                                <view class="card-row">
+                        >
-                                    <Countdown :startTime="item.zphjbsj" :endTime="item.zphjzsj" />
+                            <view class="card-row">
-                                </view>
+                                <Countdown :startTime="item.zphjbsj" :endTime="item.zphjzsj" />
-                                <view class="card-Title">{{ item.zphmc }}</view>
+                            </view>
-                                <view class="card-row">
+                            <view class="card-Title">{{ item.zphmc }}</view>
-                                    <view class="rowleft">{{ item.zphdz }}</view>
+                            <view class="card-row">
-                                    <view class="rowright" style="white-space: nowrap">
+                                <view class="rowleft">{{ item.zphdz }}</view>
-                                        <!-- <convert-distance
+                                <view class="rowright" style="white-space: nowrap">
+                                    <!-- <convert-distance
                                         :alat="item.latitude"
                                         :along="item.longitude"
                                         :blat="latitudeVal"
@@ -101,7 +101,7 @@ onLoad(() => {
 
 function chnageRanOption(item) {
     ranItem.value = item;
-    getList();
+    getList('refresh');
 }
 
 function updateCancel(item) {