diff --git a/common/globalFunction.js b/common/globalFunction.js index 335aed1..9febf80 100644 --- a/common/globalFunction.js +++ b/common/globalFunction.js @@ -643,9 +643,10 @@ export function isY9MachineType() { // 一体机环境判断 export function isAsdMachineType() { - const ua = navigator.userAgent; - const isY9Machine = /asd_hanweb/i.test(ua); // 匹配机器型号 - return isY9Machine; + // const ua = navigator.userAgent; + // const isY9Machine = /asd_hanweb/i.test(ua); // 匹配机器型号 + // return isY9Machine; + return !!lightAppJssdk.user } diff --git a/config.js b/config.js index 4d64e59..dced9d7 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,6 @@ export default { - // baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网 - baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试 + baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网 + // baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试 // baseUrl: 'http://192.168.3.29:8081', // baseUrl: 'http://10.213.6.207:19010/api', // 语音转文字 diff --git a/pages/index/components/index-refactor.vue b/pages/index/components/index-refactor.vue index 9144261..7fa0cf1 100644 --- a/pages/index/components/index-refactor.vue +++ b/pages/index/components/index-refactor.vue @@ -551,12 +551,20 @@ function getJobRecommendWithNewSearch(index) { ...pageState.search, ...conditionSearch.value, }; - + $api.createRequest('/app/job/recommend', params).then((resData) => { + const currentHeight = waterfallsFlowRef.value.$el.offsetHeight; // 获取当前高度 + waterfallsFlowRef.value.$el.style.minHeight = `${currentHeight}px`; const { data } = resData; const newData = dataToImg(data); - //替换点击项以后的数据 - list.value.splice(index, list.value.length - index, ...newData) + const sliceIndex = index + 1; + list.value.splice(sliceIndex, list.value.length - sliceIndex, ...newData); + nextTick(() => { + waterfallsFlowRef.value.refresh(); + setTimeout(() => { + waterfallsFlowRef.value.$el.style.minHeight = ''; + }, 500); + }); // 更新加载状态 updateLoadmoreStatus(newData); }); @@ -567,20 +575,20 @@ function getJobListWithNewSearch(index) { // 重置分页参数 pageState.page = 1; pageState.maxPage = 2; - + const params = { current: pageState.page, pageSize: pageState.pageSize, ...pageState.search, ...conditionSearch.value, }; - + $api.createRequest('/app/job/list', params).then((resData) => { const { rows, total } = resData; // 将新数据转换为图片格式 const newData = dataToImg(rows); //替换点击项以后的数据 - list.value.splice(index, list.value.length - index, ...newData) + list.value.splice(index, list.value.length - index, ...newData); // 更新分页和加载状态 pageState.total = total; pageState.maxPage = Math.ceil(total / pageState.pageSize);