From 5f2616b3a3dbf39e88fed21de86df5bd096a227b Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Wed, 23 Oct 2024 18:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + api/api.js | 25 +++++++++++++---- components/list/bossList/index.vue | 7 +++-- components/screen/screenWork.vue | 34 +++++++++++++----------- config.js | 2 +- pages.json | 27 +++++++++++++++---- pages/index/center.vue | 4 +-- pages_order/mine/IntegralRecord.vue | 53 +++++++++++++++++++------------------ pages_order/mine/collect.vue | 11 +++++++- pages_order/mine/contactRecord.vue | 39 ++++++++++++++++++++++++--- pages_order/mine/releaseWork.vue | 13 ++++++++- pages_order/mine/seeMy.vue | 18 +++++++++---- pages_order/work/userDetail.vue | 8 ++++-- pages_order/work/workDetail.vue | 8 ++++-- store/store.js | 13 +++++++++ 15 files changed, 192 insertions(+), 71 deletions(-) diff --git a/App.vue b/App.vue index affe792..7321de3 100644 --- a/App.vue +++ b/App.vue @@ -6,6 +6,7 @@ // this.$store.commit('initConfig') this.$store.commit('getJobTypeList') this.$store.commit('getAddressList') + this.$store.commit('getNatureList') }, onHide: function() { } diff --git a/api/api.js b/api/api.js index 8035ff1..ea83d72 100644 --- a/api/api.js +++ b/api/api.js @@ -101,6 +101,11 @@ const config = { url: '/api/common/queryJobTypeList', method: 'GET', }, + //获取工作性质列表 + commonQueryJobNatureList: { + url: '/api/common/queryJobNatureList', + method: 'GET', + }, //获取banner图列表 commonQueryBannerList: { url: '/api/common/queryBannerList', @@ -139,7 +144,7 @@ const config = { //获取工作信息列表 employeeQueryJobList: { - url: '/api/employee/queryJobList', + url: '/api/employee/queryJobListByAll', method: 'GET', }, //根据Id查看工作详情 @@ -152,12 +157,17 @@ const config = { url: '/api/employee/queryJobCollectionList', method: 'GET', }, - //联系记录-我看过谁(我的找活) + //我的找活 + employeeQueryResumeByUserId: { + url: '/api/employee/queryResumeByUserId', + method: 'GET', + }, + //联系记录-我看过谁 employeeQueryWatchWho: { url: '/api/employee/queryWatchWho', method: 'GET', }, - //联系记录-谁看过我(谁看过我的简历) + //联系记录-谁看过我 employeeQueryWatchMe: { url: '/api/employee/queryWatchMe', method: 'GET', @@ -191,12 +201,17 @@ const config = { url: '/api/boss/queryJobCollectionList', method: 'GET', }, - //会员中心-联系记录-我看过谁(我的招工) + //我的招工 + bossQueryJobListByUserId: { + url: '/api/boss/queryJobListByUserId', + method: 'GET', + }, + //会员中心-联系记录-我看过谁 bossQueryWatchWho: { url: '/api/boss/queryWatchWho', method: 'GET', }, - //会员中心-联系记录-谁看过我(谁看过我的招工) + //会员中心-联系记录-谁看过我 bossQueryWatchMe: { url: '/api/boss/queryWatchMe', method: 'GET', diff --git a/components/list/bossList/index.vue b/components/list/bossList/index.vue index 02e11bf..b46c1bd 100644 --- a/components/list/bossList/index.vue +++ b/components/list/bossList/index.vue @@ -26,6 +26,9 @@ }, api : { default : '' + }, + list : { + default : [] } }, data() { @@ -35,7 +38,7 @@ pageSize: 10, }, total : 0, - list : 10, + list2 : 10, } }, methods: { @@ -46,7 +49,7 @@ this.$api(this.api, this.queryParams, res => { if(res.code == 200){ - this.list = res.result.records + this.list2 = res.result.records this.total = res.result.total } }) diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue index af618f9..fffac7e 100644 --- a/components/screen/screenWork.vue +++ b/components/screen/screenWork.vue @@ -58,7 +58,7 @@ @click="clickTag(item, i)" v-for="(t, i) in item.tag" :key="t"> - {{ t }} + {{ t.label }} @@ -95,14 +95,6 @@ label: '全国', value: 0, }, - { - label: '金牌讲解员', - value: 1 - }, - { - label: '专业讲解员', - value: 2 - }, ] }, craft: { @@ -132,11 +124,11 @@ ] }, list : [ - { - title : '您目前所属的年龄段', - tag : ['18岁～35岁', '35岁～45岁', '45岁～50岁', '50岁以上'], - index : 0, - }, + // { + // title : '您目前所属的年龄段', + // tag : ['18岁～35岁', '35岁～45岁', '45岁～50岁', '50岁以上'], + // index : 0, + // }, { title : '您希望从事的工种', tag : ['电工', '焊工', '叉车', '其他'], @@ -169,16 +161,26 @@ currentDropItem() { return this[this.activeName]; }, - ...mapState(['jobTypeList']), + ...mapState(['jobTypeList', 'natureList']), }, mounted() { - console.log('================================='); + // 工种 this.jobTypeList.forEach(n => { this.craft.child.push({ label: n.name, value: n.id, }) }) + this.list[0].tag = this.craft.child + + // 工作性质 + this.natureList.forEach(n => { + this.nature.child.push({ + label: n.name, + value: n.id, + }) + }) + this.list[1].tag = this.nature.child }, methods: { clickTag(item, i){ diff --git a/config.js b/config.js index 87741f8..b7c7734 100644 --- a/config.js +++ b/config.js @@ -13,7 +13,7 @@ const type = 'dev' // 环境配置 const config = { dev : { - baseUrl : 'https://employadmin.augcl.com/employ-api', + baseUrl : 'http://augcl.natapp1.cc/employ-api', }, prod : { baseUrl : 'https://employadmin.augcl.com/employ-api', diff --git a/pages.json b/pages.json index c09ae90..70d6698 100644 --- a/pages.json +++ b/pages.json @@ -21,7 +21,8 @@ { "path": "pages/index/center", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "navigationBarTextStyle": "white" } } ], @@ -55,16 +56,32 @@ "path": "work/workDetail" }, { - "path": "mine/collect" + "path": "mine/collect", + "style": { + "navigationBarTitleText": "", + "navigationBarTextStyle": "white" + } }, { - "path": "mine/contactRecord" + "path": "mine/contactRecord", + "style": { + "navigationBarTitleText": "", + "navigationBarTextStyle": "white" + } }, { - "path": "mine/releaseWork" + "path": "mine/releaseWork", + "style": { + "navigationBarTitleText": "", + "navigationBarTextStyle": "white" + } }, { - "path": "mine/seeMy" + "path": "mine/seeMy", + "style": { + "navigationBarTitleText": "", + "navigationBarTextStyle": "white" + } }, { "path": "mine/contract" diff --git a/pages/index/center.vue b/pages/index/center.vue index 341f966..19e8ca7 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -96,7 +96,7 @@ - 我的找活 + {{ role ? '我的招工' : '我的找活'}} @@ -190,7 +190,7 @@ tabber, }, computed: { - ...mapState(['userInfo']), + ...mapState(['userInfo', 'role']), headImage(){ return '/static/image/center/headImage.png' }, diff --git a/pages_order/mine/IntegralRecord.vue b/pages_order/mine/IntegralRecord.vue index 174a7e2..9d58970 100644 --- a/pages_order/mine/IntegralRecord.vue +++ b/pages_order/mine/IntegralRecord.vue @@ -7,15 +7,15 @@ 当前积分 - 0 + {{ formal.score + temporarily.score }} - 正式积分：0 + 正式积分：{{ formal.score }} - 临时积分：0 + 临时积分：{{ temporarily.score }} @@ -53,29 +53,6 @@ data() { return { title : '积分记录', - agentFlow : { - total : 0, - records : [ - { - type : 0, - money : 100, - createTime : '2024-04-02 20:00', - title : "佣金提现", - }, - { - type : 0, - money : 100, - createTime : '2024-04-02 20:00', - title : "佣金提现", - }, - { - type : 0, - money : 100, - createTime : '2024-04-02 20:00', - title : "佣金提现", - }, - ] - }, x : ['+', '-'], status : 0, tabs: [ @@ -88,12 +65,23 @@ ], type : 0, mixinsListApi : 'commonQueryScoreRecord', + // 正式积分 + formal : { + score : 0 + }, + // 临时积分 + temporarily : { + score : 0 + }, } }, onLoad(e) { this.status = e.status this.queryParams.type = this.type }, + onShow() { + this.getCounst() + }, methods: { leftClick() { //返回钱包 uni.navigateBack(-1) @@ -101,6 +89,19 @@ clickTabs({index}) { this.type = index this.queryParams.type = this.type + this.getData() + }, + getCounst(){ + this.$api('commonQueryScore', {type : 0}, res => { + if(res.code == 200){ + this.formal = res.result + } + }) + this.$api('commonQueryScore', {type : 1}, res => { + if(res.code == 200){ + this.temporarily = res.result + } + }) }, } } diff --git a/pages_order/mine/collect.vue b/pages_order/mine/collect.vue index 9520f51..52adb52 100644 --- a/pages_order/mine/collect.vue +++ b/pages_order/mine/collect.vue @@ -10,7 +10,7 @@ + :list="list2"/> @@ -34,6 +34,7 @@ }, ], mixinsListApi : 'employeeQueryCollectionJobList', + list2 : [], } }, computed : { @@ -48,6 +49,14 @@ clickSwipeAction({e, item}){ console.log(e, item); }, + getDataThen(list, total, result){ + let l = [] + result.forEach(res => { + res.employJob.employCollectionJob = res.employCollectionJob + l.push(res.employJob) + }) + this.list2 = l + }, } } diff --git a/pages_order/mine/contactRecord.vue b/pages_order/mine/contactRecord.vue index 84f1458..832f9f7 100644 --- a/pages_order/mine/contactRecord.vue +++ b/pages_order/mine/contactRecord.vue @@ -16,19 +16,25 @@ @click="clickTabs"> + + + - - + + diff --git a/pages_order/mine/releaseWork.vue b/pages_order/mine/releaseWork.vue index a7c6a8b..31da6b3 100644 --- a/pages_order/mine/releaseWork.vue +++ b/pages_order/mine/releaseWork.vue @@ -3,6 +3,7 @@ + :list="list"/> @@ -21,6 +22,7 @@ import workListSwipe from '@/components/list/workList/workListSwipe.vue' import statisticsNumber from '../components/statistics/statisticsNumber.vue' import mixinList from '@/mixins/list.js' + import { mapState } from 'vuex' export default { mixins : [mixinList], components : { @@ -43,8 +45,17 @@ } }, ], + mixinsListApi : 'employeeQueryResumeByUserId', } }, + computed : { + ...mapState([ + 'role', + ]), + }, + onLoad() { + this.mixinsListApi = this.role ? 'bossQueryJobListByUserId' : 'employeeQueryResumeByUserId' + }, methods: { clickSwipeAction({e, item}){ console.log(e, item); diff --git a/pages_order/mine/seeMy.vue b/pages_order/mine/seeMy.vue index e149568..7c242c3 100644 --- a/pages_order/mine/seeMy.vue +++ b/pages_order/mine/seeMy.vue @@ -1,7 +1,7 @@