Merge remote-tracking branch 'origin/bin' into media-css

packageA/pages/exhibitors/exhibitors.vue

@@ -1,6 +1,6 @@
 <template>
     <AppLayout title="" :use-scroll-view="false">
-        <template #headerleft>
+        <template #headerleft v-if="isMiniProgram">
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
@@ -83,7 +83,7 @@
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
                     ></renderCompanysOutData>
-                    <empty v-else is-position></empty>
+                    <empty v-if="!pageState.list.length" is-position></empty>
                 </view>
             </scroll-view>
         </view>
@@ -110,6 +110,8 @@ import useLocationStore from '@/stores/useLocationStore';
 const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
 
 const isExpanded = ref(false);
 const fairInfo = ref({});
@@ -121,7 +123,7 @@ const pageState = reactive({
     maxPage: 1,
     pageSize: 10,
 });
-const hasnext = ref(true);
+const hasnext = ref(false);
 
 const zphId = ref('');
 const pageOptions = ref({});
@@ -163,7 +165,8 @@ function getCompanyList(type = 'add') {
             const str = pageState.pageSize * (pageState.current - 1);
             const end = pageState.list.length;
             const reslist = rows;
-            pageState.list.splice(str, end, ...reslist);
+            pageState.list = [...pageState.list, ...rows];
+            // pageState.list.splice(str, end, ...reslist);
         } else {
             pageState.list = rows;
         }