Merge remote-tracking branch 'origin/prod' into prod

pages/login/login.nvue

@@ -312,9 +312,14 @@
 						});
 						uni.switchTab({
 							url: '/pages/home/home'
+						});
+					}else{
+                        uni.showToast({
+                            title: res.msg,
+                            icon: 'none',
+                            duration: 1500
                         });
 					}
-
 				}
 			},
 			fnChangeLogin() {