From 4ebfc2cc5a5b26f5223abc652b508ca2915c8eb1 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 27 Feb 2020 00:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 context/Java110Context.js     | 2 ++
 factory/LoginFactory.js       | 2 +-
 pages/changePwd/changePwd.vue | 2 +-
 pages/login/login.vue         | 5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/context/Java110Context.js b/context/Java110Context.js
index 95bf8fe..07674d8 100644
--- a/context/Java110Context.js
+++ b/context/Java110Context.js
@@ -177,6 +177,8 @@ const getCommunity = function (callBack,reload,_condition) {
 	  _condition = {};
   }
   
+  console.log('_condition',_condition);
+  
   _condition.userId = _userInfo.userId;
   _condition.storeId = _userInfo.storeId;
   
diff --git a/factory/LoginFactory.js b/factory/LoginFactory.js
index 90aa14d..bbf360a 100644
--- a/factory/LoginFactory.js
+++ b/factory/LoginFactory.js
@@ -53,7 +53,7 @@ class LoginFactory {
 	console.log("用户信息",userInfo);
 	
 	if(userInfo == null || userInfo == undefined || userInfo == ''){
-		uni.redirectTo({
+		uni.navigateTo({
 			url:"/pages/login/login"
 		})
 		
diff --git a/pages/changePwd/changePwd.vue b/pages/changePwd/changePwd.vue
index 36c24f7..3ba4396 100644
--- a/pages/changePwd/changePwd.vue
+++ b/pages/changePwd/changePwd.vue
@@ -71,7 +71,7 @@
 					userId: this.java110Context.getUserInfo().userId,
 					oldPwd: this.oldPwd,
 					newPwd: this.newPwd
-				}
+				};
 				
 				uni.request({
 					url: this.java110Constant.url.changeStaffPwd,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cff3350..875a3a0 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -101,9 +101,12 @@
 							expireTime: afterOneHourDate.getTime(),
 							createTime: new Date().getTime()
 						});
-						uni.switchTab({
+						
+						uni.reLaunch({
 							url: "/pages/index/index"
 						});
+						
+					
 					},
 					fail: function(error) {
 						// 调用服务端登录接口失败