Merge branch 'dev-ft' into 'main'

fix:修改登录页返回提示信息

See merge request huang/thingskit-app!56

@@ -135,9 +135,10 @@ export default {
 									});
 									});
 								}
 								}
 							})
 							})
-
 							.catch(e => {
 							.catch(e => {
-								uni.$u.toast(e.data?.message);
+								if (e?.data?.data === null) {
+									uni.$u.toast(e.data?.msg);
+								}
 							});
 							});
 					}
 					}
 				},
 				},