From 21835e52c1d8e9f0bcfe3c0fb9ebd0620b5d5701 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Wed, 5 Jun 2024 14:30:33 +0800 Subject: [PATCH] =?UTF-8?q?flat:=20=E6=B7=BB=E5=8A=A0=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + components/companyList/companyList.vue | 478 ++++++++++---------- components/companyList/workList.vue | 491 +++++++++++---------- pageMy/my/resume/addSkill.vue | 584 ++++++++++++------------- pages/project/project.vue | 17 +- store/getters.js | 38 +- store/models/user.js | 31 ++ 7 files changed, 867 insertions(+), 773 deletions(-) diff --git a/App.vue b/App.vue index b8288cb..495e81d 100644 --- a/App.vue +++ b/App.vue @@ -24,6 +24,7 @@ this.$store.dispatch('startRefreshTokenTimer') this.$store.dispatch('startRefreshNewsTimer') this.$store.dispatch('refreshAuthState') + this.$store.dispatch('getUserLocation') } // #ifdef H5 // 企业定制 diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue index 9096a5b..4911c3b 100644 --- a/components/companyList/companyList.vue +++ b/components/companyList/companyList.vue @@ -1,226 +1,254 @@ - - - - - \ No newline at end of file diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue index d6ada40..db4ac15 100644 --- a/components/companyList/workList.vue +++ b/components/companyList/workList.vue @@ -1,234 +1,259 @@ - - - - - \ No newline at end of file diff --git a/pageMy/my/resume/addSkill.vue b/pageMy/my/resume/addSkill.vue index e3416ad..231b4d2 100644 --- a/pageMy/my/resume/addSkill.vue +++ b/pageMy/my/resume/addSkill.vue @@ -1,292 +1,292 @@ - - - - - + + + + + \ No newline at end of file diff --git a/pages/project/project.vue b/pages/project/project.vue index 10f0921..16b64d7 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -35,7 +35,7 @@ - + @@ -125,7 +125,9 @@ getcoder } from "@/api/map.js"; import verticalMenu from '@/components/vertical-menu/vertical-menu.vue'; - + import { + mapGetters + } from 'vuex' export default { components: { vTabs, @@ -134,7 +136,9 @@ workList, userrecruitList }, - + computed: { + ...mapGetters(['userLocation']), + }, data() { return { policyContentList: [], @@ -180,6 +184,7 @@ }, onLoad: function() { this.getData() + console.log('userLocation', this.userLocation) // this.getPolicy() }, onShow: function() { @@ -398,7 +403,8 @@ return } if (this.activeTab === 2) { - if (this.policyPage.current <= Math.ceil(this.policyPage.total / this.policyPage.size)) { + if (this.policyPage.current <= Math.ceil(this.policyPage.total / this.policyPage + .size)) { if (this.isSearch) { this.getPolicySearch() } else { @@ -527,7 +533,8 @@ this.policyPage.current += 1; this.policyPage.total = res.data.data.total; if (res.data.data && res.data.data.records.length) { - this.policyContentList = this.policyContentList.concat(res.data.data.records); + this.policyContentList = this.policyContentList.concat(res.data.data + .records); } }) diff --git a/store/getters.js b/store/getters.js index b775e70..9bd7c58 100644 --- a/store/getters.js +++ b/store/getters.js @@ -1,18 +1,20 @@ -const getters = { - language: state => state.common.language, - website: state => state.common.website, - userInfo: state => state.user.userInfo, - userChecked:state=>state.user.userChecked, - area: state => state.area, - news: state=> state.news, - auth: state => state.auth, - authPass: (state,getters) => getters.auth.laborState && getters.auth.realNameState && getters.auth.bankCardState && getters.auth.insureState, - authInfo: state => state.auth.authInfo, - face: state => state.face, - realName: state => state.authentication.realName, - bankCard: state => state.authentication.bankCard, - autograph: state => state.authentication.autograph, - sendTimes:state => state.user.sendTimes,//接收短信的次数 -} - -export default getters +const getters = { + language: state => state.common.language, + website: state => state.common.website, + userInfo: state => state.user.userInfo, + userChecked: state => state.user.userChecked, + area: state => state.area, + news: state => state.news, + auth: state => state.auth, + authPass: (state, getters) => getters.auth.laborState && getters.auth.realNameState && getters.auth + .bankCardState && getters.auth.insureState, + authInfo: state => state.auth.authInfo, + face: state => state.face, + realName: state => state.authentication.realName, + bankCard: state => state.authentication.bankCard, + autograph: state => state.authentication.autograph, + sendTimes: state => state.user.sendTimes, //接收短信的次数 + userLocation: state => state.user.userLocation, //用户位置 +} + +export default getters \ No newline at end of file diff --git a/store/models/user.js b/store/models/user.js index 245af73..4a4065c 100644 --- a/store/models/user.js +++ b/store/models/user.js @@ -64,8 +64,36 @@ const user = { seeEnterprise: getStore({ //用户发送短信次数 name: 'enterprise' }) || 0, // 0 个体招工 ； 企业招工 + userLocation: null }, actions: { + getUserLocation({ + commit, + dispatch + }) { + console.log('getUserLocation null1') + commit('setLocation', { + latitude: 31.133980, + longitude: 104.404419, + }) + // uni.getLocation({ + // type: 'gcj02', + // success: function(res) { + // const { + // longitude, + // latitude + // } = res + // commit('setLocation', { + // longitude, + // latitude + // }) + // }, + // fail: function(err) { + // commit('setLocation', null) + // }, + // complete: function(e) {} + // }) + }, //用户点击radio按钮 UserCheckedBtn({ commit @@ -186,6 +214,9 @@ const user = { }, }, mutations: { + setLocation(state, val) { + state.userLocation = val + }, setEnterprise(state, val) { // 0 个体招工 ； 企业招工 state.seeEnterprise = val; setStore({