|
|
@@ -7,7 +7,7 @@
|
|
|
</view>
|
|
|
<view class="jiazheng-search-box">
|
|
|
<view @click.stop="clickAlltype" class="select-item-box">
|
|
|
- <text class="select-text">{{data.leixing}}</text>
|
|
|
+ <text class="select-text">{{data.zyName}}</text>
|
|
|
<icon :class="allJtClass" />
|
|
|
</view>
|
|
|
|
|
|
@@ -36,6 +36,7 @@
|
|
|
<view>
|
|
|
<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
|
|
|
:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
|
|
|
+ @scrolltolower="onScrolltolower"
|
|
|
class="jz-scroll-view">
|
|
|
<uni-list class="admin-list-box">
|
|
|
<view class="jz-new-btn-box">
|
|
|
@@ -67,8 +68,9 @@
|
|
|
<view class="content-text-row">
|
|
|
{{item.jiguanShengName === item.jiguanShiName ? item.jiguanShengName : `${item.jiguanShengName} ${item.jiguanShiName}`}}人
|
|
|
</view>
|
|
|
- <view class="content-lx-box">
|
|
|
- <view class="content-lx-item" v-for="item2 in item.leixing" :key="item2">
|
|
|
+
|
|
|
+ <view v-if="item.zyNames.length>0" class="content-lx-box">
|
|
|
+ <view class="content-lx-item" v-for="item2 in item.zyNames" :key="item2">
|
|
|
{{item2}}
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -101,6 +103,7 @@
|
|
|
import {
|
|
|
getJiazhengList,
|
|
|
getJiazhengJineng,
|
|
|
+ getJiazhengZhiyeAll,
|
|
|
getJiazhengLeixing
|
|
|
} from "@/api/jiazheng.js"
|
|
|
import dataChecked from './common/dataChecked.vue';
|
|
|
@@ -111,7 +114,8 @@
|
|
|
const shareRef = ref(null);
|
|
|
let allType = ref([])
|
|
|
let data = reactive({
|
|
|
- leixing: '全部类型',
|
|
|
+ zyId: '',
|
|
|
+ zyName: '全部职业',
|
|
|
page: 0,
|
|
|
size: 10,
|
|
|
realName: '',
|
|
|
@@ -170,6 +174,11 @@
|
|
|
refreshData()
|
|
|
}
|
|
|
|
|
|
+ function onscrolltolower(){
|
|
|
+ getMore()
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
function luruTimeClick() {
|
|
|
data.sortType = 2
|
|
|
const isFirst = isFirstClickluru.value == 'true';
|
|
|
@@ -308,7 +317,8 @@
|
|
|
|
|
|
function selectChangeSkill(item) {
|
|
|
if (item.length > 0) {
|
|
|
- data.leixing = item[0].name
|
|
|
+ data.zyId = item[0].id
|
|
|
+ data.zyName = item[0].name
|
|
|
console.log('selectChangeSkill', item);
|
|
|
data.page = 0;
|
|
|
refreshData()
|
|
|
@@ -317,7 +327,7 @@
|
|
|
|
|
|
function refreshData() {
|
|
|
const opt = {
|
|
|
- "leixing": data.leixing == '全部类型' ? '' : data.leixing,
|
|
|
+ "zyId": data.zyId == '全部职业' ? '' : data.zyId,
|
|
|
"page": 1,
|
|
|
"realName": data.realName,
|
|
|
"size": 10,
|
|
|
@@ -339,7 +349,11 @@
|
|
|
const newItem = {
|
|
|
...item
|
|
|
};
|
|
|
- newItem.leixing = item.leixing.split(',');
|
|
|
+ if(item.zyNames ==''){
|
|
|
+ newItem.zyNames = []
|
|
|
+ }else{
|
|
|
+ newItem.zyNames = item.zyNames.split(',');
|
|
|
+ }
|
|
|
return newItem;
|
|
|
})
|
|
|
data.loading = false;
|
|
|
@@ -359,7 +373,7 @@
|
|
|
|
|
|
function getMore() {
|
|
|
const opt = {
|
|
|
- "leixing": data.leixing == '全部类型' ? '' : data.leixing,
|
|
|
+ "zyId": data.zyId == '全部职业' ? '' : data.zyId,
|
|
|
"page": 1,
|
|
|
"realName": data.realName,
|
|
|
"size": 10,
|
|
|
@@ -379,7 +393,11 @@
|
|
|
const newItem = {
|
|
|
...item
|
|
|
};
|
|
|
- newItem.leixing = item.leixing.split(',');
|
|
|
+ if(item.zyNames ==''){
|
|
|
+ newItem.zyNames = []
|
|
|
+ }else{
|
|
|
+ newItem.zyNames = item.zyNames.split(',');
|
|
|
+ }
|
|
|
return newItem;
|
|
|
})
|
|
|
console.log('data.list', data.list);
|
|
|
@@ -400,9 +418,10 @@
|
|
|
|
|
|
function getLeixing() {
|
|
|
let req = {}
|
|
|
- getJiazhengJineng(req).then(res => {
|
|
|
- res.data.unshift("全部类型");
|
|
|
- allType = dataConversionObject(res.data)
|
|
|
+ getJiazhengZhiyeAll(req).then(res => {
|
|
|
+ res.data.unshift({id:'',name:'全部职业'});
|
|
|
+ allType = res.data
|
|
|
+ // allType = dataConversionObject(res.data)
|
|
|
console.log('allType', allType);
|
|
|
})
|
|
|
}
|
wangguoyu