From d1f5645d6cbf076730d8dc24a784700fc92b1073 Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 5 Jul 2022 23:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E5=8F=8A=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/request.js | 4 +- pages.json | 2 + pages/index/my-home.vue | 10 +- pages/my/certification.vue | 389 ++++++++++++++++++++++++++++ pages/my/master-occupancy.vue | 106 ++++---- pages/my/master-settled-info.vue | 23 +- pages/order-manage/order-manage.vue | 2 +- 7 files changed, 463 insertions(+), 73 deletions(-) create mode 100644 pages/my/certification.vue diff --git a/common/js/request.js b/common/js/request.js index 508c132..b38018c 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -13,8 +13,8 @@ export default { }) let userInfo = _this.getCurUserInfo(); // request 触发前拼接 url - args.url = 'https://www.opsoul.com' + args.url; - // args.url = 'http://127.0.0.1:80' + args.url; + // args.url = 'https://www.opsoul.com' + args.url; + args.url = 'http://127.0.0.1:80' + args.url; // args.url = 'http://192.168.2.42:80' + args.url; if (!args.data) { diff --git a/pages.json b/pages.json index 8155686..3df00da 100644 --- a/pages.json +++ b/pages.json @@ -51,6 +51,8 @@ "path": "account-security" }, { "path": "master-settled-info" + }, { + "path": "certification" }] }], "globalStyle": { diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue index bbdf6d8..1165a0b 100644 --- a/pages/index/my-home.vue +++ b/pages/index/my-home.vue @@ -31,8 +31,9 @@ - 实名认证 + :class="curUserInfo.status === 0 ? 'text-main-color' : 'text-gray'" + @click="goToPage('/pages/my/certification')"> + 实名认证 + + + + 返回 + 实名认证 + + + + + + + 已绑定 + {{bindBankCard.encodeBankNum}} + + 到帐帐号另绑 + + + 到帐帐号绑定 + + + + + + + + + 特殊技能{{index + 1}}(特殊工种如空调安装等请上传) + + + 删除 + + + + + 特殊技能： + + + + + + + + + + + + 技能证书： + + + + + + + + + + + + + + 保险证明： + + + + + + + + + + + + + + 保险日期： + + + + + + + + + + + + + + + + + + + + 已绑定 + {{bindBankCard.encodeBankNum}} + + 到帐帐号另绑 + + + 到帐帐号绑定 + + + + + + 姓名： + {{bindBankCard.name}} + + + 身份证号： + {{bindBankCard.certId}} + + + + 特殊技能： + + 类目：{{item.specialSkillName}} + 是否危险技能：{{item.dangerous === 0 ? '否' : '是'}} + + 技能证书： + + + + 保险证明： + + + 保险生效时期：{{item.insuranceStart}} ~ {{item.insuranceEnd}} + + + + 审核状态： + 审核通过 + 审核中 + 审核未通过 + + + + + + + + + + diff --git a/pages/my/master-occupancy.vue b/pages/my/master-occupancy.vue index ae57d0a..ea46209 100644 --- a/pages/my/master-occupancy.vue +++ b/pages/my/master-occupancy.vue @@ -108,10 +108,11 @@ - + + - + @@ -215,7 +216,8 @@ return { curUserInfo: {}, curStep: 0, - stepList: ['服务范围', '服务技能', '特殊技能'], + // stepList: ['服务范围', '服务技能', '特殊技能'], + stepList: ['服务范围', '服务技能'], provinceList: [], servArea: [{ cityList: [], @@ -256,7 +258,7 @@ this.curUserInfo = this.$request.getCurUserInfo(); this.loadProvinceList(); this.loadTypeList(); - this.loadSpecialSkill(); + // this.loadSpecialSkill(); }, /* 服务区域 start */ async loadProvinceList() { @@ -459,32 +461,32 @@ this.curStep = this.curStep === 0 ? 0 : --this.curStep; }, async submit() { - // let workerId = this.curUserInfo.workerId; - // let workerAreas = []; - // let goodsCategories = []; + let workerId = this.curUserInfo.workerId; + let workerAreas = []; + let goodsCategories = []; // let specialSkills = []; - // // 区域参数 - // this.servArea.forEach((item) => { - // item.streetIds.forEach((streetId) => { - // workerAreas.push({ - // workerId: workerId, - // provinceId: item.provinceObj.areaId, - // cityId: item.cityObj.areaId, - // districtId: item.districtObj.areaId, - // streetId: streetId - // }) - // }); - // }); - // // 服务品类参数 - // this.servSkill.forEach((item) => { - // item.subSubTypeIds.forEach((goodsCategoryId) => { - // goodsCategories.push({ - // workerId: workerId, - // goodsCategoryId: goodsCategoryId - // }); - // }); - // }); - // // 特殊技能参数 + // 区域参数 + this.servArea.forEach((item) => { + item.streetIds.forEach((streetId) => { + workerAreas.push({ + workerId: workerId, + provinceId: item.provinceObj.areaId, + cityId: item.cityObj.areaId, + districtId: item.districtObj.areaId, + streetId: streetId + }) + }); + }); + // 服务品类参数 + this.servSkill.forEach((item) => { + item.subSubTypeIds.forEach((goodsCategoryId) => { + goodsCategories.push({ + workerId: workerId, + goodsCategoryId: goodsCategoryId + }); + }); + }); + // 特殊技能参数 // this.specialSkill.forEach((item) => { // specialSkills.push({ // workerId: workerId, @@ -496,33 +498,25 @@ // }); // }); - // let params = { - // workerId: workerId, - // workerAreas: workerAreas, - // goodsCategories: goodsCategories, - // specialSkills: specialSkills - // } - // let res = await this.$request.workerSettled(params); - // if (res.code === 0) { - // uni.showToast({ - // icon: 'success', - // title: '提交成功' - // }) - // // 更新当前缓存的用户信息 - // let updateCurUserCacheRes = await this.$request.updateCurUserCache(); - // if (updateCurUserCacheRes) { - // uni.navigateBack({ - // delta: -1 - // }) - // } - // } - uni.showToast({ - icon: 'success', - title: '提交成功' - }) - // 更新当前缓存的用户信息 - let updateCurUserCacheRes = await this.$request.updateCurUserCache(); - if (updateCurUserCacheRes) { + let params = { + workerId: workerId, + workerAreas: workerAreas, + goodsCategories: goodsCategories, + // specialSkills: specialSkills + } + let res = await this.$request.workerSettled(params); + if (res.code === 0) { + uni.showToast({ + icon: 'success', + title: '提交成功' + }) + // 更新当前缓存的用户信息 + // let updateCurUserCacheRes = await this.$request.updateCurUserCache(); + // if (updateCurUserCacheRes) { + // uni.navigateBack({ + // delta: -1 + // }) + // } uni.navigateBack({ delta: -1 }) diff --git a/pages/my/master-settled-info.vue b/pages/my/master-settled-info.vue index e8900d5..27d1e3b 100644 --- a/pages/my/master-settled-info.vue +++ b/pages/my/master-settled-info.vue @@ -5,11 +5,7 @@ 返回 师傅入驻信息 - - 账户未审核，请填写入驻信息 - - - + 服务区域： @@ -24,7 +20,7 @@ - + - 审核状态： - 审核通过 - 审核中 - 审核未通过 - + + + + + + + + diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue index dc41ac2..573bcf4 100644 --- a/pages/order-manage/order-manage.vue +++ b/pages/order-manage/order-manage.vue @@ -147,7 +147,7 @@ - +