diff --git a/common/api.js b/common/api.js
index 1c27a6b..d9ba53a 100644
--- a/common/api.js
+++ b/common/api.js
@@ -64,7 +64,7 @@ export const bindPhone = (params) => http.get('/employ-api/employ/login/bindPhon
// 修改头像和昵称，传nickName和headimgurl
export const updateUserInfo = (params) => http.post('/employ-api/employ/user/updateUser', params)
// 公告详情
-export const getNotice = (params) => http.get('/employ-api/index/getNotice', {params:params})
+export const getNotice = (params) => http.get('/employ-api/employ/news/queryNewsById', {params:params})
// 求职者修改信息 传id修改
export const updateRole = (params) => http.post('/employ-api/user/updateRole', params)
// 招聘方修改信息 传id修改
diff --git a/pages.json b/pages.json
index 108389e..3d1b7d2 100644
--- a/pages.json
+++ b/pages.json
@@ -218,7 +218,9 @@
"navigationBarTitleText": "分类",
"navigationStyle":"default",
"navigationBarBackgroundColor": "#FF7A31",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 100
}
},
{
diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index 6ac5866..41ebc37 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -13,9 +13,9 @@
微信登录
-
+
+ 取消登录
+
@@ -161,6 +161,11 @@
}
})
},
+ onNavigator(){
+ uni.switchTab({
+ url:"/pages/home/index"
+ })
+ },
handleOpenPrivacyContract() {
// 打开隐私协议页面
wx.openPrivacyContract({
diff --git a/pages/home/component/enterprise.vue b/pages/home/component/enterprise.vue
index 0858066..db7912a 100644
--- a/pages/home/component/enterprise.vue
+++ b/pages/home/component/enterprise.vue
@@ -63,7 +63,7 @@
{{items.categoryTwo_dictText}}
-
+
联系他
diff --git a/pages/home/component/master.vue b/pages/home/component/master.vue
index fcbb7c0..0e99031 100644
--- a/pages/home/component/master.vue
+++ b/pages/home/component/master.vue
@@ -43,7 +43,6 @@
-
{{items.categoryOne_dictText}}
{{items.categoryTwo_dictText}}
{{items.payType_dictText}}
@@ -52,7 +51,6 @@
{{items.latitude,items.longitude | getDistance}}km
-
{{items.address}}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b31387b..70675ea 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -13,14 +13,14 @@
-->
-
+
-
+
@@ -85,8 +85,8 @@
},
data(){
return {
+ notList:[],
notice:[],
- noticeList:[],
status:1,
list: [
"https://cdn.uviewui.com/uview/swiper/swiper1.png"
@@ -139,8 +139,9 @@
methods:{
onNoticeDetail(index){
+ console.info(index)
uni.navigateTo({
- url:"/pages_subpack/notice/index?id="+this.notice[index].id
+ url:"/pages_subpack/notice/index?id="+this.notList[index].id
})
},
onNotice(){
@@ -148,12 +149,12 @@
let params={}
let arr=[]
noticeList(params).then(response=>{
- console.info(response)
+ console.info('noticeList',response)
response.result.records.forEach(items=>{
arr.push(items.title)
})
- that.noticeList = arr
- that.notice = response.result
+ that.notice = arr
+ that.notList = response.result.records
}).catch(error=>{
})
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
index 59e3d7c..ae8529c 100644
--- a/pages_subpack/category/index.vue
+++ b/pages_subpack/category/index.vue
@@ -1,39 +1,97 @@
-
-
-
-
-
-
- {{items.title}}
+
+
+
+
+
+
+
+
+
+
+
+ {{items.title}}
+
+
+ {{items.salaryMin}}-{{items.salaryMax}}k
+
-
- {{items.salaryMin}}-{{items.salaryMax}}k
+
+ {{items.categoryOne_dictText}}
+ {{items.categoryTwo_dictText}}
+ {{items.payType_dictText}}
+
+
+
+
+ {{items.latitude,items.longitude | getDistance}}km
+ {{items.address}}
+
+
+ {{items.createTime | formatTime}}
+
+
+ 立即接单
+
-
- {{items.categoryOne_dictText}}
- {{items.categoryTwo_dictText}}
- {{items.payType_dictText}}
-
-
-
-
-
-
- {{items.latitude,items.longitude | getDistance}}km
- {{items.address}}
+
+
+
+
+
+
+
+
+
+
+ {{items.employAuthenticationPerson.name?items.employAuthenticationPerson.name:items.hanHaiMember.nickName}}
+ {{items.sex_dictText}}-{{items.nation?items.nation:"未知"}}
+
+
+
+ {{items.categoryOne_dictText}}
+
+
+
+
+ {{items.salaryMin}}-{{items.salaryMax}}元
+
-
- {{items.createTime | formatTime}}
+
+ {{items.createTime}}
-
- 立即接单
+
+
+ {{items.categoryTwo_dictText}}
+
+
+
+
+ 联系他
+
-
-
+
+
+
@@ -51,18 +109,49 @@
tpageNo:1,
tpageSize:20,
tList:[],
+
+ rpageNo:1,
+ rpageSize:20,
+ rlist:[],
id:null,
- keyword:""
+ keyword:"",
+ current:0,
+ navList:[
+ {
+ name: '求职大厅',
+ },
+ {
+ name: '招聘大厅',
+ }
+ ],
}
},
onLoad(options) {
this.id=options.id
- this.onTaskList()
+ // this.onTaskList()
+ this.onRolelist()
},
onReachBottom() {
let that = this
- that.rpageNo = that.rpageNo + 1
- that.onTaskList()
+ if(that.current==0){
+ that.rpageNo = that.rpageNo + 1
+ that.onRolelist()
+ }else if(that.current==1){
+ that.tpageNo = that.tpageNo + 1
+ this.onTaskList()
+ }
+ },
+ onPullDownRefresh() {
+ let that = this
+ if(that.current==0){
+ that.rpageNo = 1
+ that.rlist=[]
+ that.onRolelist()
+ }else if(that.current==1){
+ that.tpageNo = 1
+ that.tList = []
+ this.onTaskList()
+ }
},
filters:{
formatTime(time) {
@@ -124,11 +213,49 @@
}
},
methods:{
+ navClick(event){
+ this.current=event.index
+ this.keyword = ""
+ if(event.index==0){
+ this.rpageNo=1
+ this.onRolelist()
+ }else if(event.index==1){
+ this.tpageNo=1
+ this.onTaskList()
+ }
+ },
+ onSearch(){
+ let that = this
+ if(that.current==0){
+ that.rpageNo = 1
+ that.onRolelist()
+ }else if(that.current==1){
+ that.tpageNo = 1
+ this.onTaskList()
+ }
+ },
+ onRolelist(){
+ rolelist({
+ pageNo:this.rpageNo,
+ pageSize:this.rpageSize,
+ title:this.keyword,
+ }).then(response=>{
+ console.info("response",response)
+ if(this.rpageNo==1){
+ this.rlist = response.result.records
+ }else{
+ this.rlist = this.rlist.concat(response.result.records)
+ }
+ }).catch(error=>{
+
+ })
+ },
onTaskList(){
taskList({
latitude:uni.getStorageSync("latitude"),
longitude:uni.getStorageSync("longitude"),
pageNo:this.tpageNo,
+ title:this.keyword,
pageSize:this.tpageSize
}).then(response=>{
if(this.tpageNo==1){
@@ -140,12 +267,36 @@
})
},
- onMasterDetail(event){
+ onTaskDetail(event){
console.info(event)
uni.navigateTo({
url:"/pages_subpack/work-detail/index?id="+event.id
})
- }
+ },
+ onRoleDetail(event){
+ console.info("event",event)
+ uni.navigateTo({
+ url:"/pages_subpack/master-detail/index?id="+event.id
+ })
+ },
+ onCustomerService(phome){
+ let that = this
+ // let obj = that.$utils.getkeyContent('phone')
+ if (uni.canIUse('makePhoneCall')) {
+ uni.makePhoneCall({
+ phoneNumber: String(phome),
+ success: function () {
+ console.log('拨打电话成功');
+ },
+ fail: function () {
+ console.log('拨打电话失败');
+ }
+ });
+ } else {
+ console.log('你的设备不支持拨打电话功能');
+ }
+
+ },
}
}
diff --git a/pages_subpack/notice/index.vue b/pages_subpack/notice/index.vue
index 7db7b73..6e1b5e5 100644
--- a/pages_subpack/notice/index.vue
+++ b/pages_subpack/notice/index.vue
@@ -28,7 +28,7 @@
onNotice(){
let that = this;
let params={
- id:that.id
+ newsId:that.id
}
getNotice(params).then(response=>{
that.detail = response.result
diff --git a/pages_subpack/person/index.vue b/pages_subpack/person/index.vue
index 0331016..9146fac 100644
--- a/pages_subpack/person/index.vue
+++ b/pages_subpack/person/index.vue
@@ -22,6 +22,24 @@
+
+
+
+
+
+
+
+ 个人照片
+
+
+
+
+
+
+
+
+
@@ -91,7 +109,8 @@
industryId:'',
industryName:'',
cerImageBackFile:[],
- cerImageFrontFile:[]
+ cerImageFrontFile:[],
+ imageFile:[]
},
rules: {
name: [{
@@ -155,7 +174,19 @@
},
trigger: 'blur'
}
- ]
+ ],
+ imageFile:[
+ {
+ validator: (rule, value, callback) => {
+ if (value === null || value === undefined || value === '' || (Array.isArray(value) && value.length === 0)) {
+ callback(new Error('请选择个人照片'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
},
}
},
@@ -186,6 +217,7 @@
this.form.industryName = person.industryName
this.form.cerImageBackFile = this.stringToKeyValueArray(person.cerImageBack)
this.form.cerImageFrontFile = this.stringToKeyValueArray(person.cerImageFront)
+ this.form.imageFile = this.stringToKeyValueArray(person.image)
}
}).catch(error=>{
@@ -245,6 +277,7 @@
categoryTwo:that.form.industryName,
cerImageBack:that.form.cerImageBackFile.map(item => item.url).join(','),
cerImageFront:that.form.cerImageFrontFile.map(item => item.url).join(','),
+ image:that.form.imageFile.map(item => item.url).join(','),
}
// if(that.form.id){
// updateRoleBoss(params).then(response=>{
@@ -295,7 +328,20 @@
})
})
})
- }
+ },
+ async afterImageFileRead(e) {
+ let self = this
+ e.file.forEach(file => {
+ self.$Oss.ossUpload(file.url).then(url => {
+ self.form.imageFile.push({
+ url
+ })
+ })
+ })
+ },
+ deleteImageFilePic(event) {
+ this.form.imageFile.splice(e.index, 1)
+ },
}
}
diff --git a/pages_subpack/work-detail/index.vue b/pages_subpack/work-detail/index.vue
index 15df0b2..3566916 100644
--- a/pages_subpack/work-detail/index.vue
+++ b/pages_subpack/work-detail/index.vue
@@ -97,32 +97,34 @@
},
openAddress(){
let that = this
- // wx.openLocation({
- // latitude: that.items.latitude.toFixed(2),
- // longitude: that.items.longitude.toFixed(2),
- // name: that.items.title,
- // address: that.items.address,
- // scale: 12,
- // success: function(res) {
- // console.log(JSON.stringify(res));
- // },
- // fail: function(res) {
- // console.log(`openLocation fail:${JSON.stringify(res)}`);
- // }
- // })
- uni.openLocation({
- latitude: 30.492121,
- longitude: 114.410324,
- name: "保利国际中心",
- address: "武汉市洪山区关山大道",
- scale: 12,
- success: function(res) {
- console.log(JSON.stringify(res));
- },
- fail: function(res) {
- console.log(`openLocation fail:${JSON.stringify(res)}`);
- }
+ console.info(that.items.latitude)
+ console.info(that.items.longitude)
+ wx.openLocation({
+ latitude: Number(that.items.latitude),
+ longitude: Number(that.items.longitude),
+ name: that.items.title,
+ address: that.items.address,
+ scale: 12,
+ success: function(res) {
+ console.log(JSON.stringify(res));
+ },
+ fail: function(res) {
+ console.log(`openLocation fail:${JSON.stringify(res)}`);
+ }
})
+ // uni.openLocation({
+ // latitude: 30.492121,
+ // longitude: 114.410324,
+ // name: "保利国际中心",
+ // address: "武汉市洪山区关山大道",
+ // scale: 12,
+ // success: function(res) {
+ // console.log(JSON.stringify(res));
+ // },
+ // fail: function(res) {
+ // console.log(`openLocation fail:${JSON.stringify(res)}`);
+ // }
+ // })
}
}
}