diff --git a/components/base/kefu.vue b/components/base/kefu.vue
new file mode 100644
index 0000000..2b026b3
--- /dev/null
+++ b/components/base/kefu.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/components/list/workList/workItem.vue b/components/list/workList/workItem.vue
index fff3312..ff2c61e 100644
--- a/components/list/workList/workItem.vue
+++ b/components/list/workList/workItem.vue
@@ -1,6 +1,7 @@
+ :class="{ 'expired': isExpired }"
+ @click="handledClick">
{{ item.title }}
@@ -22,6 +23,12 @@
v-if="item.salaryUp">-{{ item.salaryUp }}
+
+
+
+ 招聘已截止
+
+
联系老板
@@ -70,6 +78,15 @@
return arr
},
+ // 检查是否过期
+ isExpired(){
+ if(!this.item.deadline) return false
+
+ const now = this.$dayjs()
+ const deadline = this.$dayjs(this.item.deadline)
+
+ return now.isAfter(deadline)
+ }
},
data() {
return {
@@ -78,6 +95,15 @@
},
methods: {
callPhone(){
+ // 如果过期，禁止拨打电话
+ if(this.isExpired) {
+ uni.showToast({
+ title: '招聘已截止',
+ icon: 'none'
+ })
+ return
+ }
+
uni.makePhoneCall({
phoneNumber: this.item.phone,
success() {
@@ -88,6 +114,18 @@
}
})
},
+ handledClick(){
+ // 如果过期，禁止点击
+ if(this.isExpired) {
+ uni.showToast({
+ title: '招聘已截止，无法查看详情',
+ icon: 'none'
+ })
+ return
+ }
+
+ this.$emit('click')
+ },
}
}
@@ -97,6 +135,22 @@
background-color: #fff;
padding: 20rpx;
border-radius: 20rpx;
+ position: relative;
+
+ // 过期状态样式
+ &.expired {
+ opacity: 0.6;
+ background-color: #f5f5f5;
+
+ .title {
+ color: #999;
+ }
+
+ .price {
+ color: #999 !important;
+ }
+ }
+
.top{
display: flex;
justify-content: space-between;
@@ -107,6 +161,25 @@
color: $uni-color;
}
}
+
+ // 过期状态标识
+ .expired-status {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 10;
+
+ .expired-text {
+ background-color: rgba(0, 0, 0, 0.8);
+ color: #fff;
+ padding: 16rpx 32rpx;
+ border-radius: 20rpx;
+ font-size: 28rpx;
+ font-weight: 600;
+ }
+ }
+
.bottom{
display: flex;
justify-content: space-between;
@@ -127,6 +200,13 @@
width: 20rpx;
height: 20rpx;
}
+
+ // 禁用状态样式
+ &.disabled {
+ background-color: #f0f0f0;
+ color: #999;
+ opacity: 0.6;
+ }
}
}
}
diff --git a/main.js b/main.js
index 145cf9f..62c7626 100644
--- a/main.js
+++ b/main.js
@@ -23,10 +23,12 @@ Vue.mixin(mixinConfigList)
import configPopup from '@/components/config/configPopup.vue'
import navbar from '@/components/base/navbar.vue'
import customerServicePopup from '@/components/config/customerServicePopup.vue'
+import kefu from '@/components/base/kefu.vue'
Vue.component('configPopup',configPopup)
Vue.component('navbar',navbar)
Vue.component('customerServicePopup',customerServicePopup)
+Vue.component('kefu', kefu)
const app = new Vue({
...App,
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 8c1c0a3..c0b1671 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -4,25 +4,46 @@
-
-
-
-
-
- {{username}}
-
-
- 修改资料
+
+
+
+
+
+
+
+ 未登录用户
+
+
+ 请先登录以查看个人信息
-
- 手机号：{{phone}}
+
+ 登录
-
- {{ UserExtensionInfo.vipType || '' }}
+
+
+
+
+
+
-
+
+
+ {{username}}
+
+
+ 修改资料
+
+
+
+ 手机号：{{phone}}
+
+
+ {{ UserExtensionInfo.vipType || '' }}
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -62,7 +85,8 @@
-
+
+
@@ -117,26 +141,41 @@
+
+
+
+ 登录后可查看个人数据
+
+
+
+
我的工作
在线简历
{{ role ? '我的招工' : '我的找活'}}
+
+
+
+ 在线简历
+
-
+
谁看过我
@@ -148,62 +187,62 @@
我的服务
-
+
会员充值
-
+
获取积分
-
+
积分记录
-
+
企业认证
-
+
实名认证
-
+
企业信息
+ v-if="!role || !isLoggedIn">
考证咨询
-
+
兑换码
-
+
电子合同
-
+
合同模板
-
+
面对面分享
@@ -214,12 +253,12 @@
设置与帮助
-
+
系统设置
-
+
帮助与反馈
@@ -247,14 +286,18 @@
},
computed: {
...mapState(['userInfo', 'role','banner', 'UserExtensionInfo']),
+ // 判断是否已登录
+ isLoggedIn(){
+ return this.userInfo && this.userInfo.id
+ },
headImage(){
- return this.userInfo.headImage
+ return this.userInfo.headImage || '/static/image/center/headImage.png'
},
username(){
- return this.userInfo.nickName
+ return this.userInfo.nickName || '未设置昵称'
},
phone(){
- return this.userInfo.phone
+ return this.userInfo.phone || '未绑定手机'
},
bannerList(){
return this.banner.filter(n => n.type == 1)
@@ -277,10 +320,12 @@
}
},
onShow() {
- this.$store.commit('getUserInfo')
+ if(uni.getStorageSync('token')){
+ this.$store.commit('getUserExtensionInfo')
+ this.$store.commit('getUserInfo')
+ }
this.$store.commit('getBanner')
//判断如果是登录状态则获取信息
- this.$store.commit('getUserExtensionInfo')
},
methods: {
toAddResume(){
@@ -322,6 +367,7 @@
.info {
font-size: 28rpx;
+ flex: 1;
.name {
font-size: 32rpx;
display: flex;
@@ -340,6 +386,15 @@
}
}
+ .loginBtn {
+ padding: 15rpx 30rpx;
+ background-color: rgba(255, 255, 255, 0.2);
+ color: #fff;
+ border-radius: 30rpx;
+ font-size: 28rpx;
+ border: 2rpx solid rgba(255, 255, 255, 0.5);
+ }
+
// .headBtn {
// margin-left: auto;
// padding: 15rpx 20rpx;
@@ -402,6 +457,28 @@
}
}
+ .login-tip {
+ justify-content: center;
+ align-items: center;
+ padding: 40rpx 20rpx;
+
+ .tip-content {
+ text-align: center;
+ font-size: 28rpx;
+ color: #666;
+ }
+
+ .login-tip-btn {
+ margin-top: 20rpx;
+ padding: 15rpx 40rpx;
+ background-color: $uni-color;
+ color: #fff;
+ border-radius: 30rpx;
+ font-size: 26rpx;
+ border: none;
+ }
+ }
+
.grid {
flex-direction: column;
font-size: 26rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f91e33e..c597e63 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -85,6 +85,8 @@
+
+
diff --git a/pages_order/auth/certification.vue b/pages_order/auth/certification.vue
index 99e5270..8e9c180 100644
--- a/pages_order/auth/certification.vue
+++ b/pages_order/auth/certification.vue
@@ -59,6 +59,7 @@
width="690rpx"
height="280rpx"
multiple
+ name="fileList"
@afterRead="afterRead"
@delete="deleteImage">
@@ -77,6 +78,25 @@
(确保文字清晰、可辨、避免遮挡、不全、反光)
+
+
+
+ 授权书（选填）
+
+
+
+
+
+
+
@@ -126,6 +146,7 @@
checkboxValue : [],
form : {},
fileList: [],
+ authFileList : [],
sub:0
}
},
@@ -147,18 +168,23 @@
url
}
}) : []
+
+ this.authFileList = this.form.authorizationBook ? this.form.authorizationBook.split(',').map(url => {
+ return {
+ url
+ }
+ }) : []
}
})
},
deleteImage(e){
- this.fileList.splice(e.index, 1)
+ this[e.name].splice(e.index, 1)
},
afterRead(e){
let self = this
e.file.forEach(file => {
self.$Oss.ossUpload(file.url).then(url => {
- console.log(url);
- self.fileList.push({
+ self[e.name].push({
url
})
})
@@ -177,7 +203,7 @@
name:'请输入姓名',
cerNo:'请输入身份证号码',
phone:'请输入电话号码',
- image:'身份证照片不能为空',
+ // image:'身份证照片不能为空',
})) {
return
}
diff --git a/pages_order/auth/certificationEnterprise.vue b/pages_order/auth/certificationEnterprise.vue
index 6b5e84d..f3a7b45 100644
--- a/pages_order/auth/certificationEnterprise.vue
+++ b/pages_order/auth/certificationEnterprise.vue
@@ -79,6 +79,7 @@
width="690rpx"
height="280rpx"
multiple
+ name="fileList"
@afterRead="afterRead"
@delete="deleteImage">
@@ -97,6 +98,25 @@
(确保文字清晰、可辨、避免遮挡、不全、反光)
+
+
+
+ 授权书（选填）
+
+
+
+
+
+
+
@@ -151,6 +171,7 @@
},
fileList: [],
status : 0,
+ authFileList : [],
}
},
onLoad() {
@@ -172,17 +193,23 @@
url
}
}) : []
+
+ this.authFileList = this.form.authorizationBook ? this.form.authorizationBook.split(',').map(url => {
+ return {
+ url
+ }
+ }) : []
}
})
},
deleteImage(e){
- this.fileList.splice(e.index, 1)
+ this[e.name].splice(e.index, 1)
},
afterRead(e){
let self = this
e.file.forEach(file => {
self.$Oss.ossUpload(file.url).then(url => {
- self.fileList.push({
+ self[e.name].push({
url
})
})
diff --git a/pages_order/contract/contract.vue b/pages_order/contract/contract.vue
index 9d5caf0..10ba91c 100644
--- a/pages_order/contract/contract.vue
+++ b/pages_order/contract/contract.vue
@@ -44,7 +44,7 @@
-
+
签署
@@ -83,23 +83,54 @@
},
onLoad() {
this.queryParams.role = this.role ? 1 : 0
- this.queryParams.status = 0
},
methods: {
clickTabs({index}) {
this.type = index
- this.queryParams.status = index
this.getData()
},
showPDF(item){
- uni.downloadFile({
- url : item.contract,
- success : res => {
- uni.openDocument({
- filePath: res.tempFilePath,
- })
- }
- })
+
+ // this.$utils.
+ // navigateTo('/pages_order/contract/contractDetail?id='
+ // + item.id)
+
+ // 只能查看内容的时候
+ if(this.role && item.bossStatus != 0 ||
+ item.employeeStatus != 0 && !this.role
+ ){
+ uni.downloadFile({
+ url : item.contract,
+ success : res => {
+ uni.openDocument({
+ filePath: res.tempFilePath,
+ })
+ }
+ })
+ return
+ }
+
+ uni.showModal({
+ title: '您希望的操作是？！',
+ cancelText: '签署合同',
+ confirmText: '查看内容',
+ success : e => {
+ if(e.confirm){
+ uni.downloadFile({
+ url : item.contract,
+ success : res => {
+ uni.openDocument({
+ filePath: res.tempFilePath,
+ })
+ }
+ })
+ }else{
+ this.$utils.
+ navigateTo('/pages_order/contract/electronicSignature?id='
+ + item.id)
+ }
+ }
+ })
},
}
}
@@ -184,4 +215,3 @@
}
}
-
diff --git a/pages_order/work/jobPosting.vue b/pages_order/work/jobPosting.vue
index c547f03..9a3348b 100644
--- a/pages_order/work/jobPosting.vue
+++ b/pages_order/work/jobPosting.vue
@@ -57,6 +57,14 @@
isLink
>
+
+