Merge branch 'master' of https://gitee.com/dcloud/base-app

uni_modules/uni-login-page/pages/index/phone-code.vue

@@ -138,7 +138,9 @@
 								title: '登陆成功',
 								icon: 'none'
 							});
-							uni.navigateBack()
+							uni.switchTab({
+								url:"/pages/list/list"
+							})
 						}else{
 							uni.showModal({
 								title: '错误',

uni_modules/uni-login-page/pages/index/pwd-login.vue

@@ -135,7 +135,9 @@
 								title: '登陆成功',
 								icon: 'none'
 							});
-							uni.navigateBack()
+							uni.switchTab({
+								url:"/pages/list/list"
+							})
 						}else{
 							uni.showModal({
 								title: '错误',