From 32358526c54d2e626f9f5a5892594606de6810df Mon Sep 17 00:00:00 2001 From: lijingyu007 <904564792@qq.com> Date: Thu, 23 May 2024 11:56:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=97=B6=E9=95=BF=E9=99=90?= =?UTF-8?q?=E5=88=B61+=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pagecomponent/commonheader.vue | 4 +- src/page/homepage/crowdsourcing/crowd.vue | 12 +- src/page/homepage/home/home.vue | 2 +- src/page/homepage/tool/tooldetails.vue | 174 ++---------------- src/page/personalpage/home/userUpgrade.vue | 90 ++++----- 5 files changed, 72 insertions(+), 210 deletions(-) diff --git a/src/page/common/pagecomponent/commonheader.vue b/src/page/common/pagecomponent/commonheader.vue index 50ce1ea..24d983a 100644 --- a/src/page/common/pagecomponent/commonheader.vue +++ b/src/page/common/pagecomponent/commonheader.vue @@ -85,7 +85,7 @@
- +
个人中心 @@ -127,7 +127,7 @@ } }, computed: { - ...mapGetters(['token','logindate','avatar',]), + ...mapGetters(['token','logindate','avatar','userinform']), count() { return store.getters.messageCount;　　//需要监听的数据 }, diff --git a/src/page/homepage/crowdsourcing/crowd.vue b/src/page/homepage/crowdsourcing/crowd.vue index 47cbcb2..8a66930 100644 --- a/src/page/homepage/crowdsourcing/crowd.vue +++ b/src/page/homepage/crowdsourcing/crowd.vue @@ -177,7 +177,7 @@ }}/{{task.needPerson}} -->

-

技能要求：{{ task.techNeed | limittechNeed }}

+

技能要求：{{ task.techNeed }}

驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}

地域要求：{{ task.area }}

@@ -306,15 +306,7 @@ export default { } }, components: { CrowdsourceTask }, - filters: { - limittechNeed(value) { - if (!value) return '' - if (value.length > 18) { - return value.slice(0, 18) + '...' - } - return value - }, - }, + computed: { ...mapGetters(['testtypelist', 'feescopelist', 'token', 'userinform']), }, diff --git a/src/page/homepage/home/home.vue b/src/page/homepage/home/home.vue index 750a3e4..96bf6d5 100644 --- a/src/page/homepage/home/home.vue +++ b/src/page/homepage/home/home.vue @@ -277,7 +277,7 @@ }}/{{task.needPerson}} -->

-

技能要求：{{ task.techNeed | limittechNeed }}

+

技能要求：{{ task.techNeed }}

驻场要求：{{ findByvalue(onsiteTypelist, task.onsiteType) }}

地域要求：{{ task.area }}

diff --git a/src/page/homepage/tool/tooldetails.vue b/src/page/homepage/tool/tooldetails.vue index d0a4d8b..e1b6445 100644 --- a/src/page/homepage/tool/tooldetails.vue +++ b/src/page/homepage/tool/tooldetails.vue @@ -14,78 +14,6 @@
-
@@ -447,84 +375,22 @@
- -
{{ item.name }}
-
+
{{ item.toolDesc }}
@@ -564,17 +430,19 @@ 限时免费 - 限时免费 + 限时免费 ￥{{ serviceType == '测试服务(按次计)' ? buyTool.priceTime : buyTool.price }} + 1 {{ buyTool.deliverType }} @@ -681,8 +549,8 @@ export default { qianbaoShow: false, jypassword: '', id: '', - amount: '', //购买数量 - buyAmount: '', //弹窗购买数量 + amount: 1, //购买数量 + buyAmount: 1, //弹窗购买数量 goodsactive: '1', // swipcelist:[{id:0,imgurl:'/assets/tool/swipc.png'},{id:1,imgurl:'/assets/tool/swipc.png'},{id:2,imgurl:'/assets/tool/swipc.png'}], tool: {}, //工具详情 @@ -788,9 +656,7 @@ export default { components: { qrcode: VueQrcode, }, - filters: { - - }, + filters: {}, computed: { ...mapGetters(['paytype', 'tooltypelist', 'token', 'userinform']), addPriceAll() { @@ -877,7 +743,7 @@ export default { goSetPassword() { this.$router.push({ path: '/console/account', - query: {code: '3'} + query: { code: '3' }, }) }, findByvalue, @@ -1053,7 +919,7 @@ export default { param.userId = this.userinform.userId param.password = encrypt(this.jypassword) param.priceType = this.serviceType == '使用时长(按月计)' ? 'month' : 'times' - param.recordName = '购买工具：' + this.buyTool.name + param.recordName = '购买工具：' + this.buyTool.name orderPay(param).then((res) => { if (res.retcode == 'SUCCESS') { this.qianbaoShow = false diff --git a/src/page/personalpage/home/userUpgrade.vue b/src/page/personalpage/home/userUpgrade.vue index 48567a3..aa201c4 100644 --- a/src/page/personalpage/home/userUpgrade.vue +++ b/src/page/personalpage/home/userUpgrade.vue @@ -51,7 +51,7 @@ > 注： {{ testerdata.auditOpinion ? testerdata.auditOpinion : '无' }}，{{ testerdata.auditOpinion ? testerdata.auditOpinion +',' : '' }} 审核未能通过，请完善后再提交
@@ -99,7 +99,7 @@ > 注： {{ - testerdata.auditOpinion ? testerdata.auditOpinion : '' + testerdata.auditOpinion ? testerdata.auditOpinion+',' : '' }} 审核未能通过，请完善后再提交
@@ -360,7 +360,7 @@ export default { contactName: res.data.companyContactName, } this.$emit('setTip', {dec: res.data.companyDesc,applyId: res.data.companyApplyId}) - if (res.data.companyStatus == 1 && userinform.companyStatus !=2) { + if (res.data.companyStatus == 1 && this.userinform.companyStatus != 2) { getInfo().then((res) => { const user = res.user this.$store.commit('SET_USERINFORM', user) @@ -389,8 +389,8 @@ export default { } if (this.testerdata) { if (this.testerdata.status == 0) { - this.testerStatus = 1 - this.istest = true + this.testerStatus = 3 + // this.istest = true } else if (this.testerdata.status == 1) { this.testerStatus = 2 this.istest = true @@ -404,44 +404,44 @@ export default { }) }, x2ctChild() { - gettesterId(this.userinform.userId).then((res) => { - this.testerdata = res.data - if (this.testerdata) { - let { applyId, name, idNumber, city, certificateUrl, testSkills, workExperience, userId } = - this.testerdata - // let setidNumber=idNumber.slice(0,2)+'************'+idNumber.slice(14) - let imglist = [] - if (certificateUrl) { - imglist.push(certificateUrl) - } - this.certifform = { - applyId, - name, - idNumber, - city, - certificateUrl: imglist, - testSkills, - workExperience, - userId, - } - this.certification = true - if (this.testerdata) { - if (this.testerdata.status == 0) { - this.testerStatus = 1 - this.istest = true - } else if (this.testerdata.status == 1) { - this.testerStatus = 2 - this.istest = true - } else if (this.testerdata.status == 2) { - this.testerStatus = 3 - } else { - this.testerStatus = 0 - } - } - } else { - this.certification = true - } - }) + this.certification = true + // gettesterId(this.userinform.userId).then((res) => { + // this.testerdata = res.data + // if (this.testerdata) { + // let { applyId, name, idNumber, city, certificateUrl, testSkills, workExperience, userId } = + // this.testerdata + // let imglist = [] + // if (certificateUrl) { + // imglist.push(certificateUrl) + // } + // this.certifform = { + // applyId, + // name, + // idNumber, + // city, + // certificateUrl: imglist, + // testSkills, + // workExperience, + // userId, + // } + // this.certification = true + // if (this.testerdata) { + // if (this.testerdata.status == 0) { + // this.testerStatus = 1 + // this.istest = true + // } else if (this.testerdata.status == 1) { + // this.testerStatus = 2 + // this.istest = true + // } else if (this.testerdata.status == 2) { + // this.testerStatus = 3 + // } else { + // this.testerStatus = 0 + // } + // } + // } else { + // this.certification = true + // } + // }) }, // 取消按钮 certCancel() { @@ -477,10 +477,12 @@ export default { this.getcertinfor() this.certification = false } else { + this.certification = false } }) .catch((error) => { this.getcertinfor() + this.certification = false }) } else { addtesterApply(data) @@ -491,10 +493,12 @@ export default { this.getcertinfor() this.certification = false } else { + this.certification = false } }) .catch((error) => { this.getcertinfor() + this.certification = false }) } }