diff --git a/src/api/request2.js b/src/api/request2.js index f654afbd..8dc5ef33 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -19,7 +19,7 @@ export function getCaptchaImage(params) { */ export function login(username, password, code, uuid, tenantName) { return request({ - url: baseApi + '/system/auth/login', + url: baseApi + '/system/auth/loginNoCode', headers: { isToken: false }, diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 50420dd7..71ac4b30 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -65,13 +65,13 @@ - + - + @@ -119,7 +119,8 @@ imageSrc: "", code: "", uuid: "", - version: "" + version: "", + needCode:false } }, // computed: mapState(['forcedLogin', 'hasLogin']), @@ -185,13 +186,15 @@ icon: 'none', mask: true }) - } else if (this.code === '') { + } + else if (this.needCode&&this.code === '') { uni.showToast({ title: '验证码不能为空', icon: 'none', mask: true }) - } else { + } + else { // console.log("用户名:", this.username, "密码:", this.password, this.tapstyle, this.smloginmsg) let logininfo = { username: "",