From ab41af526455c5b47f59f7920877b4e79c33c939 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Thu, 26 Dec 2024 23:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/model/boss.js | 20 +- api/model/index-lzx.js | 10 +- config.js | 2 +- pages.json | 3 + pages/index/center.vue | 11 +- pages_order/auth/certification.vue | 12 +- pages_order/auth/certificationEnterprise.vue | 107 +++++---- pages_order/mine/MemberRecharge.vue | 18 +- pages_order/mine/updateUser.vue | 319 +++++++++++++++++++++++++++ pages_order/work/addResume.vue | 7 +- pages_order/work/bossDetail.vue | 25 ++- pages_order/work/jobPosting.vue | 6 +- store/store.js | 2 +- utils/oss-upload/oss/index.js | 5 + 14 files changed, 442 insertions(+), 105 deletions(-) create mode 100644 pages_order/mine/updateUser.vue diff --git a/api/model/boss.js b/api/model/boss.js index 935f80e..9666fe3 100644 --- a/api/model/boss.js +++ b/api/model/boss.js @@ -1,25 +1,7 @@ -// 积分相关接口 +// boss相关接口 const api = { - //会员中心-我的收藏(数量统计) - bossQueryCollectionCount: { - url: '/api/boss/queryCollectionCount', - method: 'GET', - auth: true, - }, - //会员中心-联系记录-谁看过我(数量统计) - bossQueryWatchMeCount: { - url: '/api/boss/queryWatchMeCount', - method: 'GET', - auth: true, - }, - //会员中心-联系记录-我看过谁(数量统计) - bossQueryWatchWhoCount: { - url: '/api/boss/queryWatchWhoCount', - method: 'GET', - auth: true, - }, } export default api \ No newline at end of file diff --git a/api/model/index-lzx.js b/api/model/index-lzx.js index 12ca0b5..e414048 100644 --- a/api/model/index-lzx.js +++ b/api/model/index-lzx.js @@ -84,17 +84,9 @@ const api = { //我的服务-企业实名认证 addAuthenticationCompany: { url: '/employ/authentication/addAuthenticationCompany', - method: 'GET', + method: 'POST', auth: true }, - - - - - - - - } export default api \ No newline at end of file diff --git a/config.js b/config.js index 2ca1da3..03ac722 100644 --- a/config.js +++ b/config.js @@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'dev' +const type = 'prod' // 环境配置 diff --git a/pages.json b/pages.json index 5c06797..0baf623 100644 --- a/pages.json +++ b/pages.json @@ -183,6 +183,9 @@ }, { "path": "auth/certificationEnterprise" + }, + { + "path": "mine/updateUser" } ] }], diff --git a/pages/index/center.vue b/pages/index/center.vue index 67bf3c3..fe50973 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -8,7 +8,8 @@ - + {{username}} @@ -32,7 +33,8 @@ - + - + diff --git a/pages_order/auth/certification.vue b/pages_order/auth/certification.vue index f4a0f80..07e0e7e 100644 --- a/pages_order/auth/certification.vue +++ b/pages_order/auth/certification.vue @@ -136,7 +136,7 @@ //获取个人实名信息 getAuthenticationPerson(){ this.$api('getAuthenticationPerson',{}, res =>{ - if(res.code == 200){ + if(res.code == 200 && res.result){ this.form = res.result || {}; @@ -162,10 +162,15 @@ }) }) }) - }, //提交实名认证信息 :lzx sumbit(){ + if(!this.checkboxValue.length){ + return uni.showToast({ + title: '请先同意个人实名认证服务协议', + icon:'none' + }) + } this.form.image = this.fileList.map((item) => item.url).join(",") if(this.$utils.verificationAll(this.form,{ name:'请输入姓名', @@ -194,9 +199,6 @@ }) } - - - } } diff --git a/pages_order/auth/certificationEnterprise.vue b/pages_order/auth/certificationEnterprise.vue index 6d1168a..a2e5ef8 100644 --- a/pages_order/auth/certificationEnterprise.vue +++ b/pages_order/auth/certificationEnterprise.vue @@ -11,7 +11,7 @@ 您将获得《企业认证平台特权》 - + 已驳回，原因：{{form.remark}} @@ -22,16 +22,18 @@ + v-model="form.companyName"/> - + 企业地址 + disabled + v-model="form.companyAddress"/> @@ -40,7 +42,7 @@ + v-model="form.legalPerson"/> @@ -49,25 +51,7 @@ - - - - - 联系人姓名 - - - - - - - 联系电话 - - + v-model="form.socialCode"/> @@ -108,21 +92,19 @@ - + 认证 - + 已审核通过 - + 已驳回,请重新提交 - - { - if(res.code == 200){ + this.$api('getAuthenticationCompany', {}, res =>{ + if(res.code == 200 && res.result){ - this.form = res.result || {}; + this.form = res.result; - this.sub = this.form.status || 0; + this.status = this.form.status || 0; - this.fileList = this.form.image ? this.form.image.split(',').map(url => { + this.fileList = this.form.businessLicense ? this.form.businessLicense + .split(',').map(url => { return { url } @@ -192,16 +177,22 @@ }) }) }) - }, - //提交实名认证信息 :lzx + //提交企业认证信息 :lzx sumbit(){ - this.form.image = this.fileList.map((item) => item.url).join(",") + if(!this.checkboxValue.length){ + return uni.showToast({ + title: '请先同意企业认证服务协议', + icon:'none' + }) + } + this.form.businessLicense = this.fileList.map((item) => item.url).join(",") if(this.$utils.verificationAll(this.form,{ - name:'请输入姓名', - cerNo:'请输入身份证号码', - phone:'请输入电话号码', - image:'身份证照片不能为空', + companyName : '请输入企业名称', + companyAddress : '请选择企业地址', + legalPerson : '请输入企业法人', + socialCode : '请输入社会统一信用代码', + businessLicense : '工商营业执照不能为空', })) { return } @@ -213,19 +204,37 @@ delete this.form.updateTime delete this.form.userId - this.$api('addAuthenticationPerson',this.form, res =>{ + this.$api('addAuthenticationCompany', this.form, res =>{ if(res.code == 200){ uni.showToast({ title:'提交成功!等待审核', icon: 'none' - }) + }) setTimeout(uni.navigateBack,1000,-1) } }) - } - - - + }, + //地图上选择地址 + selectAddr() { + uni.chooseLocation({ + success: (res) => { + //经纬度信息 + this.form.latitude = res.latitude + this.form.longitude = res.longitude + + // if (res.name) { //用户直接选择城市的逻辑 + if (!res.address && res.name) { //用户直接选择城市的逻辑 + return this.form.companyAddress = res.name + } + if (res.address || res.name) { + return this.form.companyAddress = res.address + res.name + } + this.form.companyAddress = '' //用户啥都没选就点击勾选 + this.form.latitude = '' + this.form.longitude = '' + } + }); + }, } } diff --git a/pages_order/mine/MemberRecharge.vue b/pages_order/mine/MemberRecharge.vue index 8809f4f..2bb0f24 100644 --- a/pages_order/mine/MemberRecharge.vue +++ b/pages_order/mine/MemberRecharge.vue @@ -26,7 +26,9 @@ {{numInfo.vipType}} - {{ item.name }} @@ -40,11 +42,13 @@ {{ vip.name }} - + {{ item[0] }} - 该{{ item[1] }} + {{ item[1] }} + + + + + + + + + + 确认 + + + + + + + \ No newline at end of file diff --git a/pages_order/work/addResume.vue b/pages_order/work/addResume.vue index 4c81a51..1cffc5e 100644 --- a/pages_order/work/addResume.vue +++ b/pages_order/work/addResume.vue @@ -278,11 +278,8 @@ }, queryResumeByUserId(){ this.$api('queryResumeByUserId', res => { - if(res.code == 200){ - this.form = res.result.records[0] || { - sex : '男', - qulification : '', - } + if(res.code == 200 && res.result){ + this.form = res.result.records[0] if(res.result.records[0]!=null){ this.form.id=res.result.records[0].id diff --git a/pages_order/work/bossDetail.vue b/pages_order/work/bossDetail.vue index 06bf4a9..884337c 100644 --- a/pages_order/work/bossDetail.vue +++ b/pages_order/work/bossDetail.vue @@ -4,6 +4,15 @@ + + + + - + @@ -85,7 +95,6 @@ hanHaiMember:{}, collectionFlag : false, mixinsListApi : 'employeeQueryJobList', - urls: ['https://via.placeholder.com/400x200.png/3c9cff/fff'], } }, onLoad({id}) { @@ -127,6 +136,18 @@ width: 100%; height: 500rpx; } + .close{ + position: absolute; + left: 30rpx; + width: 60rpx; + height: 60rpx; + border-radius: 50%; + top: 100rpx; + background-color: #00000033; + display: flex; + justify-content: center; + align-items: center; + } .box{ margin-top: -100rpx; .boss-box{ diff --git a/pages_order/work/jobPosting.vue b/pages_order/work/jobPosting.vue index 7b4c005..614f9fb 100644 --- a/pages_order/work/jobPosting.vue +++ b/pages_order/work/jobPosting.vue @@ -321,11 +321,11 @@ this.form.longitude = res.longitude // if (res.name) { //用户直接选择城市的逻辑 - if (!res.workAddress && res.name) { //用户直接选择城市的逻辑 + if (!res.address && res.name) { //用户直接选择城市的逻辑 return this.form.workAddress = res.name } - if (res.workAddress || res.name) { - return this.form.workAddress = res.workAddress + res.name + if (res.address || res.name) { + return this.form.workAddress = res.address + res.name } this.form.workAddress = '' //用户啥都没选就点击勾选 this.form.latitude = '' diff --git a/store/store.js b/store/store.js index 90406b4..ee1a5b4 100644 --- a/store/store.js +++ b/store/store.js @@ -10,7 +10,7 @@ const store = new Vuex.Store({ state: { configList: {}, //配置列表 // 角色 true为老板 false为工人 - role : false, + role : true, userInfo : {}, //用户信息 banner : [],//轮播图 jobTypeList : [],//工种 diff --git a/utils/oss-upload/oss/index.js b/utils/oss-upload/oss/index.js index 024eb80..40706d2 100644 --- a/utils/oss-upload/oss/index.js +++ b/utils/oss-upload/oss/index.js @@ -43,6 +43,9 @@ function storeFolder() { * @param folder 存储桶中的目标文件夹 */ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { + uni.showLoading({ + title: '上传中...' + }) return new Promise((resolve, reject) => { if (folder && folder?.length > 0) { if (folder[0] == "/") folder = folder.slice(1, folder.length) @@ -63,6 +66,7 @@ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { signature: OSSConfig.signature, }, success(res) { + uni.hideLoading() if (res.errMsg.includes("uploadFile:ok")) { resolve(ossConfig.aliOss.url + key) } else { @@ -70,6 +74,7 @@ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { } }, fail(err) { + uni.hideLoading() reject(err) } }