From ec45f5474f9fd11eeadd3eb5f03e9be80c621331 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Mon, 28 Mar 2022 14:33:30 +0800 Subject: [PATCH] update --- src/components/case/index.vue | 52 ++++++++++++++----- src/pages/counter/list/index.vue | 11 +++- .../list/personal/timeDeposit/deposit.vue | 4 +- .../list/personal/timeDeposit/openAccount.vue | 28 +++++----- src/utils/utilFunction.js | 4 +- test.js | 18 ------- 6 files changed, 65 insertions(+), 52 deletions(-) diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 9fe057f..903bdf6 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -396,6 +396,7 @@ export default { } getProjectBySystemId(params).then((data)=>{ if(data.status == 200){ + // this.getQueryCaches() //获取当前时间 this.getBeginTime() this.topicList = [] @@ -405,16 +406,30 @@ export default { this.topicList.push(data.data.projects[i]) } } - if(this.topicList.length > 0){ - this.selectProjects({ - projectId: this.topicList[0].projectId - }) + // if(this.topicList.length > 0){ + // // const projectIndex = JSON.parse(sessionStorage.getItem('projectIndex')) + // // const projectId = sessionStorage.getItem('projectId') + // // console.log('---projectId') + // // console.log(projectId) + // // if(!projectId) { + // // this.selectProjects({ + // // projectId: this.topicList[0].projectId + // // }) + // // // localStorage.setItem('projectId') + // // }else { + // // this.selectProjects({ + // // projectId: projectId + // // }) + // // } + + // this.selectProjects({ + // projectId: this.topicList[0].projectId + // }) - this.gotuQueryVariable() - // 加的 - } - console.log('this.topicList---') - console.log(this.topicList) + + // this.gotuQueryVariable() + // // 加的 + // } this.getQueryCaches() } }).catch((error)=>{ @@ -521,13 +536,24 @@ export default { //选择好题目 selectProject(){ // 和重新开始区别开，不再问是否再试一次 - this.lockIt = false + // this.lockIt = false + // let token = sessionStorage.getItem('token') + // let cid = sessionStorage.getItem('cid') + // let systemId = sessionStorage.getItem('systemId') + // let projectId = sessionStorage.getItem('projectId') + // sessionStorage.clear() + // sessionStorage.setItem('token', token) + // sessionStorage.setItem('cid', cid) + // sessionStorage.setItem('systemId', systemId) + // sessionStorage.setItem('projectId', projectId) + // this.topicList[localProjectIndex].projectId + // localStorage.setItem('localProjectIndex', JSON.stringify(this.projectId)) this.clearStore() - // deleteCache().then((data)=>{ + deleteCache().then((data)=>{ - // }).catch(() => { + }).catch(() => { - // }) + }) let params = { "projectId":this.projectId, diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index f6de870..4c8373f 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -146,7 +146,7 @@ - + @@ -678,6 +678,13 @@ export default { }, computed: { // 业务一和其他业务的银行卡不一样 + needPasswordAgain() { + if(this.id == '62,1' || this.id == '62,2' || this.id == '62,3' || this.id == '129' || this.id == '167' || this.id == '301') { + return true + }else { + return false + } + }, importanceArr() { const arr = [ {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:428}, @@ -1623,7 +1630,7 @@ export default { if(this.passwordForm.passwordAgain.length !== 6) { this.setTipsOperate('您输入的密码不足6位!') return - }else if((this.id == '62,1' || this.id == '62,2' || this.id == '62,3') && this.passwordForm.password2 !== this.passwordForm.passwordAgain) { + }else if(this.needPasswordAgain && this.passwordForm.password2 !== this.passwordForm.passwordAgain) { this.setTipsOperate('两次输入密码不一致') return } diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index b55e4c2..253ef1f 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -55,8 +55,8 @@ - - + 不续存 + 续存 diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index 726e2cc..cf36999 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -6,7 +6,7 @@ - + @@ -49,12 +49,13 @@ -
+ +
@@ -230,10 +231,10 @@ export default{ this.idNumberJudge = true this.form.idNumber = this.dataFlow.idNumber || '441515199812064569' } - if(sessionStorage.getItem('nomtimeOpenAccount2')) { - this.cardNumberJudge = true - this.form.voucherNumber = this.dataFlow.voucherNumber || '159753' - } + // if(sessionStorage.getItem('nomtimeOpenAccount2')) { + // this.cardNumberJudge = true + // this.form.voucherNumber = this.dataFlow.voucherNumber || '159753' + // } return } @@ -250,11 +251,11 @@ export default{ console.log(this.idNumberJudge) } - if(sessionStorage.getItem('nomtimeOpenAccount2')) { - const { voucherNumber } = this.dataFlow - this.cardNumberJudge = true - this.form.voucherNumber = voucherNumber - } + // if(sessionStorage.getItem('nomtimeOpenAccount2')) { + // const { voucherNumber } = this.dataFlow + // this.cardNumberJudge = true + // this.form.voucherNumber = voucherNumber + // } this.getFormData() @@ -270,9 +271,6 @@ export default{ setPopId: 'system/setPopId', setTipsOperate: 'system/setTipsOperate' }), - getDataBlur() { - - }, getFormData(){ const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,26,58,118' const cards = { diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js index ac7285a..b50e6bd 100644 --- a/src/utils/utilFunction.js +++ b/src/utils/utilFunction.js @@ -191,8 +191,8 @@ const autoPlay = (parentId, form, myTable2, myTable, cards=[]) => { // projectId:+projectId, startTime:startTime, } - console.log('---提交的') - console.log(formList) + // console.log('---提交的addOperation') + // console.log(params) addOperation(params).then((data)=>{ // Message.success({ // center: true, diff --git a/test.js b/test.js index a2328d0..e69de29 100644 --- a/test.js +++ b/test.js @@ -1,18 +0,0 @@ -{"avatar":"https://huoran.oss-cn-shenzhen.aliyuncs.com/20220120/jpg/1484105277204094976.jpg","cours -eId":"","userId":"","roleId":"","manager":{},"provinceList":[{"provinceId":1,"provinceName":"北京市","isDel":0},{"pr -ovinceId":2,"provinceName":"天津市","isDel":0},{"provinceId":3,"provinceName":"上海市","isDel":0},{"provinceId":4,"prov -inceName":"重庆市","isDel":0},{"provinceId":5,"provinceName":"河北省","isDel":0},{"provinceId":6,"provinceName":"山西省", -"isDel":0},{"provinceId":7,"provinceName":"台湾省","isDel":0},{"provinceId":8,"provinceName":"辽宁省","isDel":0},{"provinc -eId":9,"provinceName":"吉林省","isDel":0},{"provinceId":10,"provinceName":"黑龙江省","isDel":0},{"provinceId":11,"provinceN -ame":"江苏省","isDel":0},{"provinceId":12,"provinceName":"浙江省","isDel":0},{"provinceId":13,"provinceName":"安徽省","isDel -":0},{"provinceId":14,"provinceName":"福建省","isDel":0},{"provinceId":15,"provinceName":"江西省","isDel":0},{"provinceId" -:16,"provinceName":"山东省","isDel":0},{"provinceId":17,"provinceName":"河南省","isDel":0},{"provinceId":18,"provinceName":"湖 -北省","isDel":0},{"provinceId":19,"provinceName":"湖南省","isDel":0},{"provinceId":20,"provinceName":"广东省","isDel":0},{"pr -ovinceId":21,"provinceName":"甘肃省","isDel":0},{"provinceId":22,"provinceName":"四川省","isDel":0},{"provinceId":23,"province -Name":"贵州省","isDel":0},{"provinceId":24,"provinceName":"海南省","isDel":0},{"provinceId":25,"provinceName":"云南省","isDel" -:0},{"provinceId":26,"provinceName":"青海省","isDel":0},{"provinceId":27,"provinceName":"陕西省","isDel":0},{"provinceId":28," -provinceName":"广西壮族自治区","isDel":0},{"provinceId":29,"provinceName":"西藏自治区","isDel":0},{"provinceId":30,"provinceName" -:"宁夏回族自治区","isDel":0},{"provinceId":31,"provinceName":"新疆维吾尔自治区","isDel":0},{"provinceId":32,"provinceName":"内蒙古自 -治区","isDel":0},{"provinceId":33,"provinceName":"澳门特别行政区","isDel":0},{"provinceId":34,"provinceName":"香港特别行政区","isDel -":0}],"configId":"","systemId":"","orderId":"","userLoginId":"","userName":"","login -Token":"","schoolId":"","lastSystemId":null,"projectFields":{}} \ No newline at end of file