diff --git a/src/api/api.js b/src/api/api.js index 173cc9d..3ff150e 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -38,7 +38,7 @@ service.interceptors.response.use( setTimeout(() => { store.commit('user/logout') logouted = 0 - }, 6500) + }, 1500) logouted = 1 } } else { diff --git a/src/api/http.js b/src/api/http.js index e9431ee..c0f6eb5 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -16,13 +16,25 @@ export const getQueryCache = () => { return get('/bank/bank/queryCache') } export const addOperation = (params) => { - return post('/bank/bank/addOperation', params) + return post('/bank/bank/addOperation', { + ...params, + assessmentId: sessionStorage.getItem('assessmentId') || '', + competitionId: sessionStorage.getItem('competitionId') || '', + }) } export const getOperation = (params) => { - return get('/bank/bank/getOperation', params) + return post('/bank/bank/getOperation', { + ...params, + assessmentId: sessionStorage.getItem('assessmentId') || '', + competitionId: sessionStorage.getItem('competitionId') || '', + }) } export const deleteCache = () => { - return get('/bank/bank/deleteCache') + return post('/bank/bank/deleteCache', { + projectId: sessionStorage.getItem('projectId') || '', + assessmentId: sessionStorage.getItem('assessmentId') || '', + competitionId: sessionStorage.getItem('competitionId') || '', + }) } export const exportBankExperimentReport = (params) => { return post('/occupationlab/occupationlab/achievement/exportBankExperimentReport', params) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 0aa21fc..30ee161 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -157,7 +157,6 @@
-
@@ -976,7 +975,6 @@ export default { } for (let i = 0; i < this.popArr.length; i++) { if (this.popArr[i].name === getIt) { - console.log('wokaio') // this.$store.commit('system/changeGoods',{push:[this.popArr[i]]}) return } @@ -2511,9 +2509,6 @@ export default { } .goods-dia { - display: flex; - justify-content: center; - align-items: center; width: 100%; white-space: nowrap; overflow-x: auto; @@ -2528,6 +2523,7 @@ export default { .file { position: relative; + display: inline-flex; min-width: 140px; height: 140px; text-align: center; @@ -2590,6 +2586,7 @@ export default { height: 18vh; width: 100%; + .justify-center { //max-height: 13vh; } diff --git a/src/pages/manage/list/corporateLoans/application.vue b/src/pages/manage/list/corporateLoans/application.vue index b7765ae..5dcbead 100644 --- a/src/pages/manage/list/corporateLoans/application.vue +++ b/src/pages/manage/list/corporateLoans/application.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue index 4be2692..6190860 100644 --- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue +++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue @@ -42,7 +42,7 @@ - + @@ -118,6 +118,7 @@ export default { this.form.loanAmount = data.loanApplicationAmount this.form.repaymentMethodTwo = +data.repaymentMethodOne this.form.creditTermTwo = +data.creditTermOne + this.form.creditAmount = data.creditAmount } }, // 到期日期计算 diff --git a/src/pages/manage/list/corporateLoans/detail.vue b/src/pages/manage/list/corporateLoans/detail.vue index 700fc56..f854683 100644 --- a/src/pages/manage/list/corporateLoans/detail.vue +++ b/src/pages/manage/list/corporateLoans/detail.vue @@ -121,11 +121,11 @@ - + - - + + @@ -232,6 +232,7 @@ export default { if (app.guaranteeMethod) app.guaranteeMethod = +app.guaranteeMethod if (app.loanTerm) app.loanTerm = +app.loanTerm if (app.creditTermOne) app.creditTermOne = +app.creditTermOne + if (app.creditTermTwo) app.creditTermTwo = +app.creditTermTwo this.bankLoanApplication = app } diff --git a/src/pages/manage/list/corporateLoans/loan.vue b/src/pages/manage/list/corporateLoans/loan.vue index f99b528..88de137 100644 --- a/src/pages/manage/list/corporateLoans/loan.vue +++ b/src/pages/manage/list/corporateLoans/loan.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/manage/list/corporateLoans/management.vue b/src/pages/manage/list/corporateLoans/management.vue index 8ea74ca..9b1ee77 100644 --- a/src/pages/manage/list/corporateLoans/management.vue +++ b/src/pages/manage/list/corporateLoans/management.vue @@ -47,10 +47,10 @@

{{ curRow.customerName }}

-

{{ curRow.customerName }}

+

{{ curRow.arrearsAmount || 0 }}

-

{{ curRow.customerName }}

+

{{ curRow.arrearsAmount || 0 }}

diff --git a/src/pages/manage/list/corporateLoans/repayment.vue b/src/pages/manage/list/corporateLoans/repayment.vue index 3550e9f..c8f4e92 100644 --- a/src/pages/manage/list/corporateLoans/repayment.vue +++ b/src/pages/manage/list/corporateLoans/repayment.vue @@ -11,11 +11,11 @@ - +