diff --git a/changelog.md b/changelog.md index e7726a38c6d253e9f938d50ef9d4fdf60623a935..7c0bb03c0467baaedc1d284261ccc2b14277b1f1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,5 @@ +## 1.1.10(2021-09-23) +修复获取验证码按钮的文字,在中文模式下显示为英文的问题 ## 1.1.9(2021-09-16) 修复由多语言切换功能引起的隐私政策协议标题链接被重写的问题 ## 1.1.8(2021-09-15) diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue index 2a512be452ef20b728f0a939debe13f40eb3165e..5e4615b9a28a63037a5d47311b13d676cb69520a 100644 --- a/components/uni-send-sms-code/uni-send-sms-code.vue +++ b/components/uni-send-sms-code/uni-send-sms-code.vue @@ -54,8 +54,8 @@ }, computed: { innerText() { - if (this.reverseNumber == 0) return this.$t('common').getVerifyCode; - return this.$t('smsCode.resendVerifyCode') + '(' + this.reverseNumber + 's)'; + if (this.reverseNumber == 0) return this.$t('common.getVerifyCode'); + return this.$t('smsCode.resendVerifyCode')+ '('+this.reverseNumber+'s)'; } }, created() { @@ -173,4 +173,4 @@ .inner-text-active { color: #007aff; } - + diff --git a/package.json b/package.json index 28b42c7d72c07393622c01add56f58e53192cd87..be5be28c2de0c07952782f336c925de640222ecb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.1.9", + "version": "1.1.10", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue index 85cbe3b7092c5dbbb75b9aafd2f589809b9e4bb4..342134452dfe8cffe86c935dd87e731171f11ac7 100644 --- a/pages/ucenter/settings/settings.vue +++ b/pages/ucenter/settings/settings.vue @@ -2,7 +2,7 @@ - + @@ -264,10 +264,10 @@ language = globalData.locale = 'en' } uni.setStorageSync('CURRENT_LANG', language) - getApp().globalData.$i18n.locale = language - this.currentLanguage = res.tapIndex?'简体中文':'English' - if(uni.setLocale){ - uni.setLocale(language) + getApp().globalData.$i18n.locale = language + this.currentLanguage = res.tapIndex?'简体中文':'English' + if(uni.setLocale){ + uni.setLocale(language) } uni.reLaunch({ url: '/pages/list/list', diff --git a/uni_modules/uni-id-cf/changelog.md b/uni_modules/uni-id-cf/changelog.md index 003b54b045813855e8b936a76c934f2a965705e6..4e835c06f52b7c68a8d52942dde9fa735f345ba8 100644 --- a/uni_modules/uni-id-cf/changelog.md +++ b/uni_modules/uni-id-cf/changelog.md @@ -1,3 +1,5 @@ +## 1.0.6(2021-09-23) +修复微信登陆成功后没有添加日志的问题 ## 1.0.5(2021-08-10) - 修复登陆成功后响应体包含userInfo.password的问题 - 新增微信登陆成功后,自动获取用户的微信昵称和头像完善用户个人资料 diff --git a/uni_modules/uni-id-cf/package.json b/uni_modules/uni-id-cf/package.json index 3ffcb2811ec7000c60e4bd9e4e55e5fe6913285c..7c286ee17edc1d8781ca46ea9844b989a315ded1 100644 --- a/uni_modules/uni-id-cf/package.json +++ b/uni_modules/uni-id-cf/package.json @@ -1,7 +1,7 @@ { "id": "uni-id-cf", "displayName": "uni-id-cf", - "version": "1.0.5", + "version": "1.0.6", "description": "uni-id-cf", "keywords": [ "uni-id-cf", diff --git a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js index 3ae366f2ecec6563aa34b47246ca9413b56c3582..3169f8b47de27ea4c976d84b8b51afd60e4da3f7 100644 --- a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js +++ b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js @@ -271,11 +271,9 @@ exports.main = async (event, context) => { } delete loginRes.accessToken delete loginRes.refreshToken - return loginRes - }else{ - return loginRes } - await loginLog(res) + await loginLog(loginRes) + return loginRes break; case 'loginByUniverify': res = await uniID.loginByUniverify(params)