diff --git a/App.vue b/App.vue index ba619ac..056b547 100644 --- a/App.vue +++ b/App.vue @@ -5,7 +5,7 @@ onShow: function() { // this.$store.commit('initConfig') this.$store.commit('getJobTypeList') - // this.$store.commit('getAddressList') + this.$store.commit('getAddressList') }, onHide: function() { } diff --git a/api/api.js b/api/api.js index eb12bbe..c5b1e3c 100644 --- a/api/api.js +++ b/api/api.js @@ -147,7 +147,11 @@ const config = { url: '/api/common/queryStrartJobLists', method: 'GET', }, - + //会员中心-正式积分||临时积分||积分记录 + commonQueryScore: { + url: '/api/common/queryScore', + method: 'GET', + }, /** * 求职者的接口 @@ -190,7 +194,7 @@ const config = { */ //获取简历列表 bossQueryJobList: { - url: '/api/boss/queryJobList', + url: '/api/boss/queryResumeListByAll', method: 'GET', }, //根据Id查看简历详情 @@ -203,6 +207,21 @@ const config = { url: '/api/boss/queryContractList', method: 'GET', }, + //我的收藏 + bossQueryCollectionJobList: { + url: '/api/boss/queryJobCollectionList', + method: 'GET', + }, + //会员中心-联系记录-我看过谁(我的招工) + bossQueryWatchWho: { + url: '/api/boss/queryWatchWho', + method: 'GET', + }, + //会员中心-联系记录-谁看过我(谁看过我的招工) + bossQueryWatchMe: { + url: '/api/boss/queryWatchMe', + method: 'GET', + }, } export function api(key, data, callback, loadingTitle) { diff --git a/pages.json b/pages.json index 4bd7d20..67e8f2c 100644 --- a/pages.json +++ b/pages.json @@ -98,6 +98,12 @@ }, { "path": "auth/certification" + }, + { + "path": "work/jobPosting" + }, + { + "path": "kepp/keepAccountsDetail" } ] }], diff --git a/pages/index/index.vue b/pages/index/index.vue index 0ddea55..5686a79 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -47,6 +47,19 @@ + + + 发布 + + + + + + {{ role ? '招工' : '找活' }} + + + @@ -88,6 +101,8 @@ // this.$refs.videoList.queryVideoList() // this.queryBannerList() // }, + + // 页面显示的时候触发 onShow() { this.$refs.workList.getData() this.$store.commit('getBanner') @@ -132,6 +147,40 @@ } } } + .box{ + position: fixed; + left: 50%; + background: $uni-color; + bottom: calc(env(safe-area-inset-bottom) + 150rpx); + color: #fff; + display: flex; + justify-content: center; + align-items: center; + transform: translate(-50%); + border-radius: 20rpx; + height: 80rpx; + font-size: 28rpx; + image{ + width: 100%; + height: 100%; + border-radius: 50%; + } + .left{ + padding-left: 30rpx; + } + .center{ + width: 100rpx; + height: 100rpx; + border-radius: 50%; + background: $uni-color; + margin: 0 20rpx; + margin-top: -30rpx; + box-shadow: 0 0 4rpx 4rpx #ffffff; + } + .right{ + padding-right: 30rpx; + } + } .content{ position: relative; margin-top: -60rpx; diff --git a/pages/index/keepAccounts.vue b/pages/index/keepAccounts.vue index 3904cbe..8e24e2e 100644 --- a/pages/index/keepAccounts.vue +++ b/pages/index/keepAccounts.vue @@ -42,27 +42,61 @@ color: '#3796F8', }"> + + + + + + {{ item.title }} + + + {{ item.createTime }} + + + + + + 设置 + + + + 记工 + + + 记账 + + + + + - 新建项目 + {{ addOrUpdate ? '编辑项目' : '新建项目'}} 项目名称： - 请输入项目名称： - + + - + + 取消 确定 @@ -107,6 +141,10 @@ show: false, mixinsListApi : 'commonQueryStrartJobLists', apiType : '', + addOrUpdate : false, + form : { + title : '', + }, } }, computed: { @@ -157,6 +195,51 @@ } } } + + .list{ + .item{ + margin: 30rpx; + background-color: #fff; + padding: 20rpx; + border-radius: 20rpx; + .top{ + display: flex; + justify-content: space-between; + padding: 20rpx; + .title{ + font-weight: 900; + } + .date{ + + } + } + .btn{ + display: flex; + justify-content: space-between; + padding: 20rpx; + .left{ + display: flex; + align-items: center; + } + .right{ + display: flex; + view{ + padding: 15rpx 40rpx; + margin: 0 10rpx; + border-radius: 10rpx; + } + .b1{ + border: 1px solid #FFA011; + color: #FFA011; + } + .b2{ + background: $uni-color; + color: #fff; + } + } + } + } + } .warp { display: flex; @@ -166,7 +249,6 @@ .rect { width: 90%; - height: 700rpx; background-color: #fff; border-radius: 20rpx; overflow: hidden; @@ -201,10 +283,11 @@ } .rect-input { - height: 60rpx; + height: 40rpx; background-color: #EBF0FC; border: 2rpx solid #4280FD; border-radius: 14rpx; + padding: 10rpx 20rpx; } .option { @@ -231,7 +314,7 @@ justify-content: space-around; text-align: center; align-content: center; - margin-top: 70rpx; + margin: 50rpx 0; view:nth-child(1) { color: #575757; diff --git a/pages_order/kepp/keepAccountsDetail.vue b/pages_order/kepp/keepAccountsDetail.vue new file mode 100644 index 0000000..e7ea6d8 --- /dev/null +++ b/pages_order/kepp/keepAccountsDetail.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/pages_order/mine/IntegralRecord.vue b/pages_order/mine/IntegralRecord.vue index d32b578..00d3f00 100644 --- a/pages_order/mine/IntegralRecord.vue +++ b/pages_order/mine/IntegralRecord.vue @@ -47,7 +47,9 @@ @@ -101,6 +133,17 @@ background-color: #fff; padding: 20rpx; } + + .form-sheet-cell{ + display: flex; + background-color: #fff; + padding: 20rpx 30rpx; + font-size: 24rpx; + align-items: center; + view{ + width: 150rpx; + } + } .help-button { display: flex; diff --git a/pages_order/mine/seeMy.vue b/pages_order/mine/seeMy.vue index 07941f6..e149568 100644 --- a/pages_order/mine/seeMy.vue +++ b/pages_order/mine/seeMy.vue @@ -9,7 +9,7 @@ - + @@ -17,6 +17,7 @@ import bossList from '@/components/list/bossList/index.vue' import statisticsNumber from '../components/statistics/statisticsNumber.vue' import mixinList from '@/mixins/list.js' + import { mapState } from 'vuex' export default { mixins : [mixinList], components : { @@ -39,8 +40,17 @@ } }, ], + mixinsListApi : 'bossQueryWatchMe', } }, + computed : { + ...mapState([ + 'role', + ]), + }, + onLoad() { + this.mixinsListApi = (this.role ? 'boss' : 'employee') + 'QueryWatchMe' + }, methods: { clickSwipeAction({e, item}){ console.log(e, item); diff --git a/pages_order/work/jobPosting.vue b/pages_order/work/jobPosting.vue new file mode 100644 index 0000000..6888541 --- /dev/null +++ b/pages_order/work/jobPosting.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/store/store.js b/store/store.js index 3c88d36..ae68a9b 100644 --- a/store/store.js +++ b/store/store.js @@ -10,7 +10,7 @@ const store = new Vuex.Store({ state: { configList: [], //配置列表 // 角色 true为老板 false为工人 - role : true, + role : false, userInfo : {}, //用户信息 banner : [],//轮播图 jobTypeList : [],//工种