优化跳转页面的提示

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()

components/companyFinance/companyFinance.vue

@@ -110,10 +110,18 @@
 		},
 		methods: {
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url,
+            title: '加载中',
-					}) : Toast('暂未开放')
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
 			},
 			initLoad() {
 				this.loadConfig.page = 1;

components/task/index.vue

@@ -57,15 +57,23 @@
 		},
 		methods: {
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url
+            title: '加载中',
-					}) : Toast('暂未开放')
+            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) {

components/task/taskItem.vue

@@ -120,10 +120,18 @@
 		},
 		methods: {
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url,
+            title: '加载中',
-					}) : Toast('暂未开放')
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
 			},
 			clickTask() {
 				// console.log('点击', this.$props.datas);

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;

pages/oaMy/oaMy.vue

@@ -156,16 +156,30 @@
 				const res = await userInfo();
 				this.$store.commit('setUserInfo', res.data);
 			},
-			navTo(url) {
+			navTo (url) {
-				url ?
+			  if(url){
-					uni.navigateTo({
+			    uni.showLoading({
-						url: url,
+			      title: '加载中',
-						fail(e) {
+			      mask: true
-							uni.switchTab({
+			    });
-								url: url
+			    uni.navigateTo({
-							})
+			    	url: url,
-						}
+			      success() {
-					}) : Toast('暂未开放')
+			        uni.hideLoading()
+			      },
+			      fail () {
+			        uni.switchTab({
+			          url: url,
+			          success() {
+			            uni.hideLoading()
+			          },
+			          fail() {
+			            uni.hideLoading()
+			          }
+			        });
+			      },
+			    })
+			  }else Toast('暂未开放')
 			},
 			alterMyInfo() {
 				uni.navigateTo({

subpkg/captain/captain.vue

@@ -159,10 +159,18 @@
 		},
 		methods: {
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url,
+            title: '加载中',
-					}) : Toast('暂未开放')
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
 			},
 			initLoad() {
 				this.loadConfig.page = 1;

subpkg/personnel/personnel.vue

@@ -146,10 +146,18 @@
 				// console.log(a.substring(0, 10))
 			},
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url,
+            title: '加载中',
-					}) : Toast('暂未开放')
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
 			},
 			async initLoad() {
 				this.loadConfig.page = 1;

subpkg/personnelDetails/personnelDetails.vue

@@ -405,10 +405,18 @@
 				})
 			},
 			navTo(url) {
-				url ?
+				if(url){
-					uni.navigateTo({
+          uni.showLoading({
-						url: url,
+            title: '加载中',
-					}) : Toast('暂未开放')
+            mask: true
+          });
+          uni.navigateTo({
+          	url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        }else Toast('暂未开放')
 			},
 			updateShow(value, type) {
 				this.updateForm[type] = value;