diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md index 5a95c025f10a699335e1a0b3fc005e7e3cc30d60..65b345bdaac9cf0f5d40e4aa27ff22e7adaffc0d 100644 --- a/uni_modules/uni-id-pages/changelog.md +++ b/uni_modules/uni-id-pages/changelog.md @@ -1,3 +1,5 @@ +## 1.0.22(2022-09-23) +- 修复 某些情况下,修改密码报“两次输入密码不一致”的bug ## 1.0.21(2022-09-21) - 修复 store.hasLogin的值在某些情况下会出错的bug ## 1.0.20(2022-09-21) diff --git a/uni_modules/uni-id-pages/common/password.js b/uni_modules/uni-id-pages/common/password.js index c3f677a79568d08bf5b375dde78a4e18dcdf3971..3e57c7add997f5a19c1b60914f7534d3cfb8c6db 100644 --- a/uni_modules/uni-id-pages/common/password.js +++ b/uni_modules/uni-id-pages/common/password.js @@ -66,7 +66,7 @@ function getPwdRules(pwdName = 'password', rePwdName = 'password2') { }, { validateFunction: function(rule, value, data, callback) { - if (value != data.password) { + if (value != data[pwdName]) { callback(ERROR.normal.rePwdErr) } return true diff --git a/uni_modules/uni-id-pages/common/store.js b/uni_modules/uni-id-pages/common/store.js index 655b41c4f9a61baf22e3140658dcfddddde32ca7..6b2a5bfe497154850c97e78d43fd0156028218b0 100644 --- a/uni_modules/uni-id-pages/common/store.js +++ b/uni_modules/uni-id-pages/common/store.js @@ -37,7 +37,7 @@ export const mutations = { } else { try { let res = await usersTable.where("'_id' == $cloudEnv_uid") - .field('mobile,nickname,user_name,email,avatar_file') + .field('mobile,nickname,username,email,avatar_file') .get() console.log('fromDbData',res.result.data); this.setUserInfo(res.result.data[0]) diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json index e6313fd21dc28491c09a69219a9b944da20f4623..928185175135d2560605c5b2e6bc628efd1ba49f 100644 --- a/uni_modules/uni-id-pages/package.json +++ b/uni_modules/uni-id-pages/package.json @@ -1,7 +1,7 @@ { "id": "uni-id-pages", "displayName": "uni-id-pages", - "version": "1.0.20", + "version": "1.0.22", "description": "云端一体简单、统一、可扩展的用户中心页面模版", "keywords": [ "用户管理", diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js index 1ef455ab1e419227ffbdfd1bdf52512659be57f4..3449010816553e6a81de1ae9c94db12a15636d1f 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/en.js @@ -12,7 +12,7 @@ const sentence = { 'uni-id-account-audit-failed': 'Account audit failed', 'uni-id-account-closed': 'Account has been closed', 'uni-id-captcha-required': 'Captcha required', - 'uni-id-password-error': 'Username or password error', + 'uni-id-password-error': 'Password error', 'uni-id-password-error-exceed-limit': 'The number of password errors is excessive', 'uni-id-invalid-username': 'Invalid username', 'uni-id-invalid-password': 'invalid password', diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js index 5bd2443f045ab895c4a33d98ab4f22e6c697c8b4..014dd4dc627db4c76197a7e30bd5d70e40667154 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lang/zh-hans.js @@ -12,7 +12,7 @@ const sentence = { 'uni-id-account-audit-failed': '此账号审核失败', 'uni-id-account-closed': '此账号已注销', 'uni-id-captcha-required': '请输入图形验证码', - 'uni-id-password-error': '用户名或密码错误', + 'uni-id-password-error': '密码错误', 'uni-id-password-error-exceed-limit': '密码错误次数过多,请稍后再试', 'uni-id-invalid-username': '用户名不合法', 'uni-id-invalid-password': '密码不合法', diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package-lock.json b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package-lock.json index a26cc97a4044bfe0d5813d1739d48e5b41ebfca0..c7d418038fdf854091fcec315cce6fcedea7952c 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package-lock.json +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package-lock.json @@ -1,12 +1,12 @@ { "name": "uni-id-co", - "version": "1.0.19", + "version": "1.0.22", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "uni-id-co", - "version": "1.0.19", + "version": "1.0.22", "dependencies": { "jsonwebtoken": "8.5.1", "lodash.merge": "^4.6.2", diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json index 6cdd385979248855baa5462fcf15571e8c3d77dd..ebce79811ae991f5e2c85e21054e3cdc0967846f 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json @@ -1,6 +1,6 @@ { "name": "uni-id-co", - "version": "1.0.19", + "version": "1.0.22", "description": "", "main": "index.js", "keywords": [],