From 6c615e599f657bf2d38142a04cceba4048f6d1ed Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 24 Aug 2023 16:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=B3=E8=BD=AC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 11 ------- components/companyFinance/companyFinance.vue | 16 ++++++--- components/task/index.vue | 18 ++++++++--- components/task/taskItem.vue | 16 ++++++--- pages/oaHome/oaHome.vue | 22 ++++++++++--- pages/oaMy/oaMy.vue | 34 ++++++++++++++------ subpkg/captain/captain.vue | 16 ++++++--- subpkg/personnel/personnel.vue | 16 ++++++--- subpkg/personnelDetails/personnelDetails.vue | 16 ++++++--- 9 files changed, 114 insertions(+), 51 deletions(-) diff --git a/App.vue b/App.vue index a598798..c3a1689 100644 --- a/App.vue +++ b/App.vue @@ -14,17 +14,6 @@ url: '/pages/oaLogin/oaLogin' }) } - - // jpushModule.initJPushService() - // const audioContext = uni.createInnerAudioContext() - // audioContext.src = './static/mp3/order.mp3' - // let ida = [0] - // jpushModule.addNotificationListener(function (result) { - // if (!ida.includes(result.messageID)) { - // audioContext.play() - // } - // ida.push(result.messageID) - // }) }, onShow: function() { const audioContext = uni.createInnerAudioContext() diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue index c789984..0cc059a 100644 --- a/components/companyFinance/companyFinance.vue +++ b/components/companyFinance/companyFinance.vue @@ -110,10 +110,18 @@ }, methods: { navTo(url) { - url ? - uni.navigateTo({ - url: url, - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, initLoad() { this.loadConfig.page = 1; diff --git a/components/task/index.vue b/components/task/index.vue index 2968932..00a96c5 100644 --- a/components/task/index.vue +++ b/components/task/index.vue @@ -57,15 +57,23 @@ }, methods: { navTo(url) { - url ? - uni.navigateTo({ - url: url - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, changeCurrent(e) { if(e.currentIndex==3){ this.$refs.controlRef._onClick(this.current); - this.navTo('/subpkg/taskAdmin/taskAdmin'); + this.navTo('/subpkg/taskAdmin/taskAdmin') return ; } if (this.current !== e.currentIndex) { diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index d972748..ba05931 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -120,10 +120,18 @@ }, methods: { navTo(url) { - url ? - uni.navigateTo({ - url: url, - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, clickTask() { // console.log('点击', this.$props.datas); diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index aba2bbc..8220e5d 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -381,17 +381,29 @@ export default { }); }, navTo (url) { - url - ? + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); uni.navigateTo({ - url: url, + url: url, + success() { + uni.hideLoading() + }, fail () { uni.switchTab({ url: url, + success() { + uni.hideLoading() + }, + fail() { + uni.hideLoading() + } }); }, - }) : - Toast("暂未开放"); + }) + }else Toast('暂未开放') }, navTwo (url, key) { let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null; diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index 97e5ed9..861a13a 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -156,16 +156,30 @@ const res = await userInfo(); this.$store.commit('setUserInfo', res.data); }, - navTo(url) { - url ? - uni.navigateTo({ - url: url, - fail(e) { - uni.switchTab({ - url: url - }) - } - }) : Toast('暂未开放') + navTo (url) { + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + }, + fail () { + uni.switchTab({ + url: url, + success() { + uni.hideLoading() + }, + fail() { + uni.hideLoading() + } + }); + }, + }) + }else Toast('暂未开放') }, alterMyInfo() { uni.navigateTo({ diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue index 4d10e5d..3c294f5 100644 --- a/subpkg/captain/captain.vue +++ b/subpkg/captain/captain.vue @@ -159,10 +159,18 @@ }, methods: { navTo(url) { - url ? - uni.navigateTo({ - url: url, - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, initLoad() { this.loadConfig.page = 1; diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue index 0001e02..cc06a34 100644 --- a/subpkg/personnel/personnel.vue +++ b/subpkg/personnel/personnel.vue @@ -146,10 +146,18 @@ // console.log(a.substring(0, 10)) }, navTo(url) { - url ? - uni.navigateTo({ - url: url, - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, async initLoad() { this.loadConfig.page = 1; diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue index a91b79b..a014ff2 100644 --- a/subpkg/personnelDetails/personnelDetails.vue +++ b/subpkg/personnelDetails/personnelDetails.vue @@ -405,10 +405,18 @@ }) }, navTo(url) { - url ? - uni.navigateTo({ - url: url, - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, updateShow(value, type) { this.updateForm[type] = value;