diff --git a/common/textdata.js b/common/textdata.js index 2f7f1c3..ccc4153 100644 --- a/common/textdata.js +++ b/common/textdata.js @@ -1,9 +1,9 @@ const companyList = [{ missionNo: "0", - missionTitle: "公司名称公司名称公司名称公司名称公司名称1", + missionTitle: "用工单位", wage: 1000, wageUnitCategory: 0, - companyName: "公司名称全程", + companyName: "用工单位", etimePub: "2020-07-25 23:59:59", cityId: "130104", skillNames: "学习能力强,服务态度好", @@ -16,7 +16,7 @@ const companyList = [{ missionTitle: "石家庄环卫清洁", wage: 1000, wageUnitCategory: 1, - companyName: "公司名称全程", + companyName: "用工单位", etimePub: "2020-07-25 23:59:59", cityId: "130104", skillNames: "学习能力强,服务态度好", @@ -26,10 +26,10 @@ const companyList = [{ }, { missionNo: "2", - missionTitle: "公司名称3", + missionTitle: "用工单位", wage: 1000, wageUnitCategory: 2, - companyName: "公司名称全程", + companyName: "用工单位", etimePub: "2020-07-25 23:59:59", cityId: "130104", skillNames: "学习能力强,服务态度好", @@ -39,7 +39,7 @@ const companyList = [{ }, ]; const companyInfo = { - missionTitle: "栾城齐鲁村镇银行阶段性客户栾城齐鲁村镇银行阶段性客户", + missionTitle: "", missionNo: "M1589187105030039", stime: "2020-07-30 00:00:00", etime: "2020-08-30 23:59:59", @@ -52,14 +52,14 @@ const companyInfo = { age: "35岁以下", education: 7, experienceDesc: "不限要求", - missionDesc: "

1.在任务期间内完成公司分配的工作任务；

2.在任务期间内遵守公司规章制度；

3.绩效工资，按劳分配工资，多劳多得；

4.最终解释权在长城宽带网络服务有限公司石家庄分公司。

", - skillNames: "能力强,态度好,学习能力强,服务态度好,学习能力强,服务态度好", - companyName: "公司名称全程公司名称全程公司名称全程", + missionDesc: "", + skillNames: "", + companyName: "用工单位", cityId: "130104", - address: "广东省广州市天河区万达D座3层", - callName: "张**", - callTel: "138****5110", - companyAddress: "河北省·石家庄市·正定新区·石家庄传媒大厦17层", + address: "", + callName: "", + callTel: "", + companyAddress: "", lat: 38.071944, lon: 114.452893, }; diff --git a/components/companyList/applyList.vue b/components/companyList/applyList.vue index 6333f99..1cdbecf 100644 --- a/components/companyList/applyList.vue +++ b/components/companyList/applyList.vue @@ -21,8 +21,8 @@ {{ item }} - - + + diff --git a/components/companyList/collectionList.vue b/components/companyList/collectionList.vue index 325f1f1..afbd6d9 100644 --- a/components/companyList/collectionList.vue +++ b/components/companyList/collectionList.vue @@ -21,8 +21,8 @@ {{ item }} - - + + diff --git a/components/companyList/newJobList.vue b/components/companyList/newJobList.vue index d03154e..e4a3d5a 100644 --- a/components/companyList/newJobList.vue +++ b/components/companyList/newJobList.vue @@ -21,8 +21,8 @@ {{ item }} - - + + diff --git a/components/companyList/newTaskList.vue b/components/companyList/newTaskList.vue index 001888f..7587214 100644 --- a/components/companyList/newTaskList.vue +++ b/components/companyList/newTaskList.vue @@ -21,8 +21,8 @@ {{ item }} - - + + diff --git a/pageMy/contract/index.vue b/pageMy/contract/index.vue index 50bf7ea..24756b6 100644 --- a/pageMy/contract/index.vue +++ b/pageMy/contract/index.vue @@ -8,7 +8,7 @@ - 任务名称：{{item.servicesName}} + 零工岗位名称：{{item.servicesName}} 合同编号：{{item.contractNo}} 合同有效期：{{item.stime | time}} 至 {{item.etime | time}} diff --git a/pageMy/myProject/browsingHistory.vue b/pageMy/myProject/browsingHistory.vue index 7b41224..fe87b40 100644 --- a/pageMy/myProject/browsingHistory.vue +++ b/pageMy/myProject/browsingHistory.vue @@ -15,8 +15,8 @@ {{ item.workname }} - 任务 - 岗位 + 零工岗位 + 全职岗位 政策 diff --git a/pages.json b/pages.json index 68b71bc..11e5f77 100644 --- a/pages.json +++ b/pages.json @@ -22,7 +22,7 @@ { "path": "pages/projectInfo/projectInfo", "style": { - "navigationBarTitleText": "任务详情", + "navigationBarTitleText": "岗位详情", "navigationBarBackgroundColor": "#FFFFFF" } }, @@ -289,7 +289,7 @@ { "path": "pages/recruit/subPage/taskProjectList", "style": { - "navigationBarTitleText": "推送任务", + "navigationBarTitleText": "推送零工岗位", "navigationBarBackgroundColor": "#FFFFFF", "enablePullDownRefresh": false } @@ -338,7 +338,7 @@ { "path": "pages/recruit/subPage/newsDetail/projectInfo", "style": { - "navigationBarTitleText": "任务详情", + "navigationBarTitleText": "岗位详情", "navigationBarBackgroundColor": "#FFFFFF" } }, @@ -367,7 +367,7 @@ { "path": "pages/news/taskProjectList", "style": { - "navigationBarTitleText": "推送任务", + "navigationBarTitleText": "推送零工岗位", "navigationBarBackgroundColor": "#FFFFFF", "enablePullDownRefresh": false } diff --git a/pages/index/index.vue b/pages/index/index.vue index 7ac2570..563f8d3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -8,7 +8,7 @@ + placeholder="搜零工岗位/搜全职岗位/搜政策" /> 搜索 @@ -72,8 +72,8 @@ - 最新任务 - 最新任务推荐 + 零工岗位 + 最新零工岗位推荐 @@ -111,8 +111,8 @@ - 最新岗位 - 最新人岗推荐 + 全职岗位 + 最新全职岗位推荐 diff --git a/pages/mapSeach/mapSeach.vue b/pages/mapSeach/mapSeach.vue index 4944f9b..f06e685 100644 --- a/pages/mapSeach/mapSeach.vue +++ b/pages/mapSeach/mapSeach.vue @@ -22,7 +22,7 @@ - 附近任务 + 附近零工岗位 @@ -34,7 +34,7 @@ - 暂无任务信息 + 暂无岗位信息 diff --git a/pages/news/news.vue b/pages/news/news.vue index 848cab9..3f61746 100644 --- a/pages/news/news.vue +++ b/pages/news/news.vue @@ -65,13 +65,13 @@ // } console.log(item.data) // 任务推送、岗位推送、政策推送 - if(item.title == '任务推送') { - console.log('任务推送') + if(item.title == '零工岗位推送') { + console.log('零工岗位推送') uni.navigateTo({ url: './taskProjectList' }) - } else if(item.title == '岗位推送') { - console.log('岗位推送') + } else if(item.title == '全职岗位推送') { + console.log('全职岗位推送') uni.navigateTo({ url: './jobProjectList' }) diff --git a/pages/project/newProject.vue b/pages/project/newProject.vue index 5eaf5db..da2bb84 100644 --- a/pages/project/newProject.vue +++ b/pages/project/newProject.vue @@ -3,7 +3,7 @@ 搜 索 - + @@ -150,7 +150,7 @@ open: false, showPopUp: false, - nonReactiveArray: ["最新任务", "最新岗位", "政策资讯"], + nonReactiveArray: ["最新零工岗位", "最新全职岗位", "政策资讯"], } }, onLoad: function(option) { @@ -162,8 +162,8 @@ }, onShow: function() { const enumTitle = { - "0": '最新任务', - "1": '最新岗位', + "0": '最新零工岗位', + "1": '最新全职岗位', "2": '最新政策', } uni.setNavigationBarTitle({ diff --git a/pages/project/project copy.vue b/pages/project/project copy.vue index ade23da..38ee387 100644 --- a/pages/project/project copy.vue +++ b/pages/project/project copy.vue @@ -3,7 +3,7 @@ 搜 索 - + @@ -174,7 +174,7 @@ isSearch: false, searchData: {}, - nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"], + nonReactiveArray: ["推荐零工岗位", "推荐全职岗位", "个体户招工"], } }, onLoad: function() { diff --git a/pages/project/project.vue b/pages/project/project.vue index bc2b9a9..e0b0f27 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -3,7 +3,7 @@ 搜 索 - + @@ -174,8 +174,7 @@ isSearch: false, searchData: {}, - // nonReactiveArray: ["推荐任务", "推荐岗位", "个体户招工"], - nonReactiveArray: ["推荐零工任务", "推荐岗位"], + nonReactiveArray: ["推荐零工岗位", "推荐全职岗位"], } }, onLoad: function() { diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue index 6a23846..53a69ae 100644 --- a/pages/projectInfo/projectInfo.vue +++ b/pages/projectInfo/projectInfo.vue @@ -92,7 +92,7 @@ 座机号：{{info.callNumber}} --> 工作地址：{{info.jobAddress || '暂无'}} diff --git a/pages/projectInfo/userrecruitInfo.vue b/pages/projectInfo/userrecruitInfo.vue index 24a4998..576e02c 100644 --- a/pages/projectInfo/userrecruitInfo.vue +++ b/pages/projectInfo/userrecruitInfo.vue @@ -29,7 +29,7 @@ - 任务要求 + 岗位要求 @@ -47,7 +47,7 @@ - 任务描述 + 岗位描述 {{info.jobDescription || '暂无'}} diff --git a/pages/projectInfo/userrecruitWorkInfo.vue b/pages/projectInfo/userrecruitWorkInfo.vue index bab3e30..9ace0cd 100644 --- a/pages/projectInfo/userrecruitWorkInfo.vue +++ b/pages/projectInfo/userrecruitWorkInfo.vue @@ -76,7 +76,7 @@ {{info.companyName}} --> diff --git a/pages/projectInfo/workInfo.vue b/pages/projectInfo/workInfo.vue index 7e30cc9..fbd1f4c 100644 --- a/pages/projectInfo/workInfo.vue +++ b/pages/projectInfo/workInfo.vue @@ -76,7 +76,7 @@ {{info.companyName}} --> diff --git a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue index 66d0a4b..a940abd 100644 --- a/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue +++ b/pages/recruit/subPage/enterpriceCertification/enterpriceCertification.vue @@ -4,8 +4,8 @@ 企业认证信息 - - + + @@ -97,7 +97,7 @@ comname: { type: 'string', required: true, - message: '请输入企业名称', + message: '请输入用工单位', trigger: ['change'] }, companyTid: { diff --git a/pages/recruit/subPage/newsDetail/projectInfo.vue b/pages/recruit/subPage/newsDetail/projectInfo.vue index a4c3980..50306b7 100644 --- a/pages/recruit/subPage/newsDetail/projectInfo.vue +++ b/pages/recruit/subPage/newsDetail/projectInfo.vue @@ -8,7 +8,7 @@ 任务编码：{{info.missionNo}} --> - 任务日期：{{ dateFormat((info.stime)) }}至{{ dateFormat((info.etime)) }} + 岗位日期：{{ dateFormat((info.stime)) }}至{{ dateFormat((info.etime)) }} --> 企业信息 - - + + @@ -188,7 +188,7 @@ export default { education: '', // 学历要求 educationLabel: '', // 学历要求前端显示 experienceDesc: '', // 经验要求 - jobCompanyName: '', // 企业名称 + jobCompanyName: '', // 用工单位 jobCompanyScale: '', // 企业信用代码 jobCompanyIndustry: '', // 所属行业 jobCompanyNature: '', // 企业性质 diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue index 7035c56..aa50571 100644 --- a/pages/recruit/subPage/task.vue +++ b/pages/recruit/subPage/task.vue @@ -56,7 +56,7 @@ border="none"> - + 企业信息 - + + placeholder="请输入用工单位"> 企业信息 - + + placeholder="请输入用工单位"> + placeholder="搜零工岗位/搜全职岗位/搜政策" /> 搜索 @@ -38,8 +38,8 @@ {{ item.name }} - 任务 - 岗位 + 零工岗位 + 全职岗位 政策 招工 diff --git a/static/img/tab.blue.svg b/static/img/tab.blue.svg index def5446..2ca9eda 100644 --- a/static/img/tab.blue.svg +++ b/static/img/tab.blue.svg @@ -3,7 +3,7 @@ 1.icon/88px/tab.blue - + 任务中 diff --git a/store/models/news.js b/store/models/news.js index 2823c4e..f930b08 100644 --- a/store/models/news.js +++ b/store/models/news.js @@ -92,7 +92,7 @@ const news = { title: 'missionTitle', desc: (value) => { if (value.data[0]) - return `您收到${value.data[0][0]['companyName']}的任务` + return `您收到${value.data[0][0]['companyName']}岗位` }, time: 'createTime', isRead: 'status', @@ -182,7 +182,7 @@ const news = { title: 'missionTitle', desc: (value) => { if (value.data[0]) - return `您收到${value.data[0][0]['companyName']}的任务` + return `您收到${value.data[0][0]['companyName']}的岗位` }, time: 'createTime', isRead: 'status', diff --git a/untils/customized.js b/untils/customized.js index d1d5d1a..9340f25 100644 --- a/untils/customized.js +++ b/untils/customized.js @@ -3,50 +3,10 @@ import { } from '@/untils/store.js' const hostDic = { - 'xhwsd.jobslink.cn': { + '10.165.0.173': { name: '劳动力转移就业公共服务平台', - id: '773491043336192037' - }, - 'lihuayaoye.jobslink.cn': { - name: '河北利华药业有限公司', - id: '773491043327803404' - }, - 'shangchensuye.jobslink.cn': { - name: '河北尚辰塑业有限公司', - id: '773491043336192009' - }, - 'jinliu.jobslink.cn': { - name: '河北金柳化纤有限公司', - id: '773491043323609148' - }, - 'zhanlifangshui.jobslink.cn': { - name: '河北展利防水机械装备有限公司', - id: '773491043336192000' - }, - 'sjzjiecheng.jobslink.cn': { - name: '石家庄捷成门窗有限公司', - id: '773491043327803407' - }, - 'aoyinlaye.jobslink.cn': { - name: '奥垠行唐蜡业有限公司', - id: '773491043336192014' - }, - 'qytongfatielu.jobslink.cn': { - name: '河北同发铁路工程集团有限公司', - id: '773491043323609097' - }, - 'mmingda.jobslink.cn': { - name: '河北科创明达信息科技有限公司', - id: '773491043323609128' - }, - 'xibumahua.jobslink.cn': { - name: '西部马华', - id: '773491043327803395' - }, - 'kaixuanxinyue.jobslink.cn': { - name: '凯旋鑫悦', - id: '773491043331997734' - }, + id: '1' + } } export function setPlatform($store, platformId, platformName) {