diff --git a/config.js b/config.js index baedf0a..a52d9d3 100644 --- a/config.js +++ b/config.js @@ -1,9 +1,9 @@ // 应用全局配置 module.exports = { - // baseUrl: 'http://zhxg.gxsdxy.cn/prod_api', + // baseUrl: 'https://zhxg.gxsdxy.cn/prod_api', // baseUrl: 'http://172.16.96.111:8085', // baseUrl: 'http://192.168.211.22:8085', - baseUrl: 'http://localhost:8088', + baseUrl: 'http://localhost:8085', // 应用信息 appInfo: { // 应用名称 diff --git a/pages/Approval/handleTask/disqualifiCationIndex/detail.vue b/pages/Approval/handleTask/disqualifiCationIndex/detail.vue index fb61dd1..4f9854c 100644 --- a/pages/Approval/handleTask/disqualifiCationIndex/detail.vue +++ b/pages/Approval/handleTask/disqualifiCationIndex/detail.vue @@ -349,18 +349,18 @@ uni.showToast({ title: res.msg }) - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) this.$refs.returnDialog.close(); }, @@ -415,17 +415,17 @@ }); } uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } + } } - } - } - }) + }) }) }, rejectDialogConfirm() { @@ -453,9 +453,9 @@ uni.navigateBack({ success: () => { const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { prevPage.handleChange(2); } } diff --git a/pages/Approval/handleTask/rtStuDropOutSchool/detail.vue b/pages/Approval/handleTask/rtStuDropOutSchool/detail.vue index e41f785..263b708 100644 --- a/pages/Approval/handleTask/rtStuDropOutSchool/detail.vue +++ b/pages/Approval/handleTask/rtStuDropOutSchool/detail.vue @@ -357,18 +357,18 @@ uni.showToast({ title: res.msg }) - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) this.$refs.returnDialog.close(); }, @@ -419,18 +419,18 @@ }); } uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) }, rejectDialogConfirm() { @@ -455,18 +455,18 @@ title: "已驳回" }) uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); - console.log('刷新已办任务数据'); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + console.log('刷新任务数据'); + } } } - } - }) + }) } }) }, diff --git a/pages/Approval/handleTask/rtStuQuitSchool/detail.vue b/pages/Approval/handleTask/rtStuQuitSchool/detail.vue index b0a5709..d85e40d 100644 --- a/pages/Approval/handleTask/rtStuQuitSchool/detail.vue +++ b/pages/Approval/handleTask/rtStuQuitSchool/detail.vue @@ -417,18 +417,18 @@ uni.showToast({ title: res.msg }) - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) this.$refs.returnDialog.close(); }, @@ -495,18 +495,18 @@ }); } uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) }, rejectDialogConfirm() { @@ -523,18 +523,18 @@ title: "已驳回" }) uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); - console.log('刷新已办任务数据'); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + console.log('刷新任务数据'); + } } } - } - }) + }) } }) }, diff --git a/pages/Approval/handleTask/rtStuReentrySchool/detail.vue b/pages/Approval/handleTask/rtStuReentrySchool/detail.vue index b966212..419c2fb 100644 --- a/pages/Approval/handleTask/rtStuReentrySchool/detail.vue +++ b/pages/Approval/handleTask/rtStuReentrySchool/detail.vue @@ -480,18 +480,18 @@ uni.showToast({ title: res.msg }) - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) this.$refs.returnDialog.close(); }, @@ -557,18 +557,18 @@ }); } uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) }, rejectDialogConfirm() { @@ -593,18 +593,18 @@ title: "已驳回" }) uni.hideLoading(); - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); - console.log('刷新已办任务数据'); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + console.log('刷新任务数据'); + } } } - } - }) + }) } }) }, diff --git a/pages/applyleave/editLeave.vue b/pages/applyleave/editLeave.vue index 48222d5..70ba8f4 100644 --- a/pages/applyleave/editLeave.vue +++ b/pages/applyleave/editLeave.vue @@ -417,12 +417,13 @@ success: () => { const pages = getCurrentPages(); if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === - 'function') { - prevPage.handleChange(2); - console.log('刷新已办任务数据'); - } + const prevPage = pages[pages.length - 2] || pages[pages.length - 1] + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(2); + console.log('刷新已办任务数据'); + } else if (prevPage && typeof prevPage.getLeaveList === 'function') { + prevPage.getLeaveList(); + } } } }) @@ -447,7 +448,7 @@ success: () => { const pages = getCurrentPages(); if (pages.length > 0) { - const prevPage = pages[pages.length - 2] + const prevPage = pages[pages.length - 2] || pages[pages.length - 1] if (prevPage && typeof prevPage.getLeaveList === 'function') { prevPage.getLeaveList(); @@ -621,8 +622,10 @@ success: () => { const pages = getCurrentPages(); if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getLeaveList === + const prevPage = pages[pages.length - 2] || pages[pages.length - 1] + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(2); + } else if (prevPage && typeof prevPage.getLeaveList === 'function') { prevPage.getLeaveList(); } diff --git a/pages/details/details.vue b/pages/details/details.vue index 4b91afa..acc7f3a 100644 --- a/pages/details/details.vue +++ b/pages/details/details.vue @@ -626,18 +626,18 @@ uni.showToast({ title: res.msg }) - uni.navigateBack({ - success: () => { - const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); + uni.navigateBack({ + success: () => { + const pages = getCurrentPages(); + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } - } - } - }) + } + }) }) this.$refs.returnDialog.close(); }, @@ -731,11 +731,11 @@ uni.navigateBack({ success: () => { const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); - } + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + } } } @@ -788,12 +788,12 @@ uni.navigateBack({ success: () => { const pages = getCurrentPages(); - if (pages.length > 0) { - const prevPage = pages[pages.length - 2] - if (prevPage && typeof prevPage.getList === 'function') { - prevPage.handleChange(2); - console.log('刷新已办任务数据'); - } + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; + if (prevPage && typeof prevPage.handleChange === 'function') { + prevPage.handleChange(this.tag || 1); + console.log('刷新任务数据'); + } } } }) diff --git a/utils/toBack.js b/utils/toBack.js index 7d91c96..0750545 100644 --- a/utils/toBack.js +++ b/utils/toBack.js @@ -3,8 +3,8 @@ export function toBackPage(delay = 1000, onSuccess = () => {}) { uni.navigateBack({ success: () => { const pages = getCurrentPages(); - if (pages.length > 1) { - const prevPage = pages[pages.length - 2]; + if (pages && pages.length > 0) { + const prevPage = pages[pages.length - 2] || pages[pages.length - 1]; onSuccess(prevPage); } }