【修改】短信相关功能：提示语句修改；

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -1213,7 +1213,7 @@ namespace Learun.Application.Organization
                 {
                     userEntity = new UserEntity()
                     {
-                        LoginMsg = "账户不存在!",
+                        LoginMsg = "账户或密码错误!",
                         LoginOk = false
                     };
                     return userEntity;
@@ -1235,7 +1235,7 @@ namespace Learun.Application.Organization
                         }
                         else
                         {
-                            userEntity.LoginMsg = "密码和账户名不匹配!";
+                            userEntity.LoginMsg = "账户或密码错误!";
                         }
                     }
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -716,7 +716,7 @@ namespace Learun.Application.Web.Controllers
             //短信验证码校验
             if (string.IsNullOrEmpty(codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             var userId = LoginUserInfo.Get().userId;
             var mobile = userIBLL.GetEntityByUserId(userId)?.F_Mobile;
@@ -755,17 +755,17 @@ namespace Learun.Application.Web.Controllers
         {
             if (string.IsNullOrEmpty(codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             UserEntity userEntity = null;
             userEntity = userIBLL.GetEntityByUserId(LoginUserInfo.Get().userId);
             if (userEntity == null)
             {
-                return Fail("用户不存在!");
+                return Fail("用户错误!");
             }
             if (string.IsNullOrEmpty(userEntity.F_Mobile))
             {
-                return Fail("用户手机号不存在!");
+                return Fail("用户手机号错误!");
             }
             if (!CommonHelper.IsValidMobile(userEntity.F_Mobile))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs

@@ -1234,21 +1234,21 @@ namespace Learun.Application.Web.Controllers
         {
             if (string.IsNullOrEmpty(codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             UserEntity userEntity = null;
             userEntity = userBll.GetEntityByMobile(phone);
             if (userEntity == null)
             {
-                return Fail("用户不存在!");
+                return Fail("输入错误!");
             }
             if (string.IsNullOrEmpty(userEntity.F_Mobile))
             {
-                return Fail("用户手机号不存在!");
+                return Fail("输入错误!");
             }
             if (!CommonHelper.IsValidMobile(userEntity.F_Mobile))
             {
-                return Fail("手机号格式不正确!");
+                return Fail("输入错误!");
             }
             if (codeType == "firstlogin" && userEntity.F_HaveLogMark == true)
             {
@@ -1299,7 +1299,7 @@ namespace Learun.Application.Web.Controllers
             //短信验证码校验
             if (string.IsNullOrEmpty(codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(phone))
             {
@@ -1312,7 +1312,7 @@ namespace Learun.Application.Web.Controllers
                 UserEntity userEntity = userBll.GetEntityByMobile(phone);
                 if (userEntity == null)
                 {
-                    return Fail("用户不存在");
+                    return Fail("输入错误。");
                 }
                 userBll.setPassword(userEntity.F_UserId, newpassword);
 
@@ -1336,7 +1336,7 @@ namespace Learun.Application.Web.Controllers
             //短信验证码校验
             if (string.IsNullOrEmpty(codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(phone))
             {
@@ -1350,7 +1350,7 @@ namespace Learun.Application.Web.Controllers
                 UserEntity userEntity = userBll.GetEntityByMobile(phone);
                 if (userEntity == null)
                 {
-                    return Fail("用户不存在!");
+                    return Fail("输入错误!");
                 }
                 if (userEntity.F_EnabledMark != 1)
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/ForgotPassword.js

@@ -159,7 +159,7 @@
                 type: "post",
                 success: (res) => {
                     if (res.code == 200) {
-                        $('#updatepwBox .error_info span').text('修改密码成功')
+                        $('#updatepwBox .error_info span').text('密码修改成功')
                         $('#updatepwBox .error_info').show()
                         setTimeout(() => {
                             window.location.href = "/";

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.WebApi
             MobileVerify mobileVerify = this.GetReqData<MobileVerify>();
             if (string.IsNullOrEmpty(mobileVerify.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(mobileVerify.mobile))
             {
@@ -93,19 +93,19 @@ namespace Learun.Application.WebApi
             LoginModel loginModel = this.GetReqData<LoginModel>();
             if (string.IsNullOrEmpty(loginModel.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             UserEntity userEntity = null;
             userEntity = userIBLL.GetEntityByUserId(userInfo.userId);
             if (userEntity == null)
             {
-                return Fail("用户不存在!");
+                return Fail("用户错误!");
             }
             if (loginModel.codeType == "unbindwx")
             {
                 if (string.IsNullOrEmpty(userEntity.F_Mobile))
                 {
-                    return Fail("用户手机号不存在!");
+                    return Fail("用户手机号错误!");
                 }
                 loginModel.username = userEntity.F_Mobile;
             }
@@ -323,7 +323,7 @@ namespace Learun.Application.WebApi
             //短信验证码校验
             if (string.IsNullOrEmpty(loginModel.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(loginModel.username))
             {
@@ -337,7 +337,7 @@ namespace Learun.Application.WebApi
                 UserEntity userEntity = userIBLL.GetEntityByMobile(loginModel.username);
                 if (userEntity == null)
                 {
-                    return Fail("用户不存在!");
+                    return Fail("输入错误!");
                 }
                 if (userEntity.F_EnabledMark != 1)
                 {
@@ -490,7 +490,7 @@ namespace Learun.Application.WebApi
             MobileVerify mobileVerify = this.GetReqData<MobileVerify>();
             if (string.IsNullOrEmpty(mobileVerify.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (mobileVerify.codeType == "unbindwx")
             {
@@ -522,7 +522,7 @@ namespace Learun.Application.WebApi
             MobileVerify mobileVerify = this.GetReqData<MobileVerify>();
             if (string.IsNullOrEmpty(mobileVerify.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(mobileVerify.mobile))
             {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs

@@ -58,7 +58,7 @@ namespace Learun.Application.WebApi
             MobileVerify mobileVerify = this.GetReqData<MobileVerify>();
             if (string.IsNullOrEmpty(mobileVerify.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             if (string.IsNullOrEmpty(mobileVerify.mobile))
             {
@@ -85,7 +85,7 @@ namespace Learun.Application.WebApi
             LoginModel loginModel = this.GetReqData<LoginModel>();
             if (string.IsNullOrEmpty(loginModel.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             UserEntity userEntity = null;
             if (loginModel.codeType == "bindwx")
@@ -98,15 +98,15 @@ namespace Learun.Application.WebApi
             }
             if (userEntity == null)
             {
-                return Fail("用户不存在!");
+                return Fail("输入错误!");
             }
             if (string.IsNullOrEmpty(userEntity.F_Mobile))
             {
-                return Fail("用户手机号不存在!");
+                return Fail("输入错误!");
             }
             if (!CommonHelper.IsValidMobile(userEntity.F_Mobile))
             {
-                return Fail("手机号格式不正确!");
+                return Fail("输入错误!");
             }
             if (loginModel.codeType == "firstlogin" && userEntity.F_HaveLogMark == true)
             {
@@ -157,7 +157,7 @@ namespace Learun.Application.WebApi
             UserEntity userEntity = userIBLL.GetEntityByMobile(modifyModel.phone);
             if (userEntity == null)
             {
-                return Fail("用户不存在");
+                return Fail("输入错误");
             }
             userIBLL.setPassword(userEntity.F_UserId, modifyModel.newpassword);
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs

@@ -189,7 +189,7 @@ namespace Learun.Application.WebApi.Modules
             //短信验证码校验
             if (string.IsNullOrEmpty(loginModel.codeType))
             {
-                return Fail("未指定短信类型。");
+                return Fail("短信类型错误。");
             }
             var mobiletemp = string.Empty;
             if (loginModel.codeType == "bindwx")