Merge branch 'jobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into jobFair

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v25.04.09.1727'
+export const vue_version = 'v25.04.14.1759'

src/views/recruit/personal/company/index.vue

@@ -13,12 +13,14 @@
       </div>
       <div v-if="items.length" class="mx-4">
         <companyItem class="mt-3" :list="items"></companyItem>
-        <MPagination
+        <CtPagination
+          v-if="total > 0"
           :total="total"
           :page="pages.pageNo"
           :limit="pages.pageSize"
           @handleChange="handleChangePage"
-        ></MPagination>
+        ></CtPagination>
+        <!-- <div class="text-center color-primary mt-5" v-if="noParams">输入筛选条件查看更多优选企业</div> -->
       </div>
       <Empty v-else class="mt-3 mx-4" :message="noParams? '请输入或选择对应的条件查找公司' : '没有对应的公司，请更换搜索条件后再试'"></Empty>
     </div>
@@ -36,7 +38,6 @@ import headSearch from '@/components/headSearch'
 import scaleType from './components/scaleType'
 // import areaType from './components/areaType'
 import companyItem from './components/companyItem'
-import MPagination from '@/components/CtPagination'
 import cityCascadeSelect from '@/views/recruit/personal/position/components/conditionFilter/cityCascadeSelect.vue'
 // F:\work\menduner\src\views\recruit\personal\position\components\conditionFilter\cityCascadeSelect.vue
 import Snackbar from '@/plugins/snackbar'

src/views/recruit/personal/position/index.vue

@@ -25,6 +25,7 @@
           :limit="pageInfo.pageSize"
           @handleChange="handleChangePage"
         ></CtPagination>
+        <!-- <div class="text-center color-primary mt-5" v-if="noParams && items.length">输入筛选条件查看更多优选职位</div> -->
       </div>
     </div>
   </div>
@@ -56,7 +57,7 @@ const showFilterList = [
   { key: 'industryIds' }
 ]
 
-const pageInfo = { pageNo: 1, pageSize: 20}
+const pageInfo = { pageNo: 1, pageSize: 20 }
 const items = ref([])
 const total = ref(0)
 let routeQuery = (route?.query && route.query && Object.keys(route?.query).length) ? reactive(route.query) : reactive({})

src/views/recruit/personal/recommend/index.vue

@@ -52,7 +52,7 @@ const handleSelectChange = (item) => {
 }
 
 const query = reactive({
-  pageNum: 1,
+  pageNo: 1,
   pageSize: 10
 })
 
@@ -66,7 +66,7 @@ const getList = async () => {
   if (list.length) {
     let data = dealDictArrayData([], list) // 处理数据
     items.value = items.value.concat(data)
-    if (query.pageNum === 1) jobId.value = items.value[0].id
+    if (query.pageNo === 1) jobId.value = items.value[0].id
     if (jobId.value) showRecommendDetails.value = true
     loadingType.value = list.length  === query.pageSize ? 0 : 2
   } else {
@@ -78,7 +78,7 @@ getList()
 const handleChangePage = () => {
   if (loadingType.value) return // 没有更多数据了
   // 加载更多
-  query.pageNum++
+  query.pageNo++
   getList()
 }