diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2006850..fd8cafd 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -184,6 +184,9 @@
 
 			// 账号密码登录
 			btndl() {
+				uni.showLoading({
+					title: '登录中...'
+				})
 				let data = {
 					username: this.zh,
 					password: this.mm
@@ -193,6 +196,7 @@
 						wx.setStorageSync('token', res.token);
 						this.ceshi()
 					} else {
+						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index b31b000..dfffb39 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -581,81 +581,86 @@
 				})
 			},
 
-			btnindex(num) {
-				this.onControltap()
-				if (this.wangluo = true) { //判断是否有网络在进行点击
-					if (num == 2) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/question/index'
-						})
-					} else if (num == 3) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/about/index?tit=' + '关于我们'
-						})
-					} else if (num == 1) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/myorder/index'
-						})
-					} else if (num == 4) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/merchant/index'
-						})
-					} else if (num == 5) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/nearby/index'
-						})
-					} else if (num == 6) {
-						if(this.dlflag == true){
-							if((this.type == 2 || this.type == 3) && this.isStaff == true){
-								this.xuanzeflag = true
-							}else if((this.type == 2 || this.type == 3) && this.isStaff != true){
-								if(this.phonenumber == ''){
-									this.huoqutelflag = true
-									this.xuanzeflag = false
-								}else{
-									this.xuanzeflag = false 
-									uni.switchTab({
-										url: '/pages/tj'
-									})
-								}
-							}else if(this.isStaff == true){
-								if(this.phonenumber == ''){
-									this.huoqutelflag = true
-									this.xuanzeflag = false
-								}else{
-									this.xuanzeflag = false 
-									uni.navigateTo({
-										url: '/page_fenbao/hehuoren/shouye'
-									})
-								}
-							}else{
-								uni.showToast({
-									title: '您当前没有权限进入',
-									icon: 'none',
-									duration: 1000
-								})
-							}
-						}else{
-							
-						}
-					} else if (num == 7) {
-						uni.navigateTo({
-							url: '/page_fenbao/statulist/fault/yichang/index'
-						})
-					}
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '请打开网络再进行操作',
-						success: function(res) {
-							if (res.confirm) {
-
-							} else if (res.cancel) {
-
-							}
-						}
-					})
-				}
+			btnindex(num) { 
+				uni.getNetworkType({
+				      success: (res) => {
+				        if (res.networkType === 'none') {
+				          uni.showToast({
+				            title: '当前无网络连接',
+				            icon: 'none',
+							duration:2000
+				          });
+				        } else {
+							this.onControltap()
+				           if (num == 2) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/question/index'
+				           	})
+				           } else if (num == 3) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/about/index?tit=' + '关于我们'
+				           	})
+				           } else if (num == 1) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/myorder/index'
+				           	})
+				           } else if (num == 4) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/merchant/index'
+				           	})
+				           } else if (num == 5) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/nearby/index'
+				           	})
+				           } else if (num == 6) {
+				           	if(this.dlflag == true){
+				           		if((this.type == 2 || this.type == 3) && this.isStaff == true){
+				           			this.xuanzeflag = true
+				           		}else if((this.type == 2 || this.type == 3) && this.isStaff != true){
+				           			if(this.phonenumber == ''){
+				           				this.huoqutelflag = true
+				           				this.xuanzeflag = false
+				           			}else{
+				           				this.xuanzeflag = false 
+				           				uni.switchTab({
+				           					url: '/pages/tj'
+				           				})
+				           			}
+				           		}else if(this.isStaff == true){
+				           			if(this.phonenumber == ''){
+				           				this.huoqutelflag = true
+				           				this.xuanzeflag = false
+				           			}else{
+				           				this.xuanzeflag = false 
+				           				uni.navigateTo({
+				           					url: '/page_fenbao/hehuoren/shouye'
+				           				})
+				           			}
+				           		}else{
+				           			uni.showToast({
+				           				title: '您当前没有权限进入',
+				           				icon: 'none',
+				           				duration: 1000
+				           			})
+				           		}
+				           	}else{
+				           		
+				           	}
+				           } else if (num == 7) {
+				           	uni.navigateTo({
+				           		url: '/page_fenbao/statulist/fault/yichang/index'
+				           	})
+				           }
+				        }
+				      },
+				      fail: (err) => {
+				        uni.showToast({
+				          title: '获取网络状态失败',
+				          icon: 'none'
+				        });
+				        console.error(err);
+				      }
+				    })
 			},
             // 商户获取手机号
 			getPhoneNumber(e){