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

pages/search/search.vue

@@ -2,7 +2,12 @@
     <view class="container">
         <view>
             <view class="top">
-                <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+                <image
+                    v-if="isMiniProgram"
+                    class="btnback button-click"
+                    src="@/static/icon/back.png"
+                    @click="navBack"
+                ></image>
                 <view class="search-box">
                     <uni-icons
                         class="iconsearch"
@@ -91,6 +96,8 @@ import { useColumnCount } from '@/hook/useColumnCount';
 import { usePagination } from '@/hook/usePagination';
 import img from '@/static/icon/filter.png';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
 const searchValue = ref('');
 const historyList = ref([]);
 const listCom = ref([]);
@@ -253,9 +260,10 @@ function getJobList(type = 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
             const end = listCom.value.length;
             const reslist = rows;
-            listCom.value.splice(str, end, ...reslist);
+            // listCom.value.splice(str, end, ...reslist);
+            listCom.value = [...listCom.value, ...reslist];
         } else {
-            listCom.value = rows;
+            listCom.value = [...rows];
         }
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);