From 5b5b56fab080b3c7a9598f911441b6e73dc13b93 Mon Sep 17 00:00:00 2001 From: linju-json Date: Thu, 23 Sep 2021 17:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=8C=89=E9=92=AE=E7=9A=84=E6=96=87=E5=AD=97?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E4=B8=AD=E6=96=87=E6=A8=A1=E5=BC=8F=E4=B8=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E8=8B=B1=E6=96=87=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 2 ++ components/uni-send-sms-code/uni-send-sms-code.vue | 6 +++--- package.json | 2 +- pages/ucenter/settings/settings.vue | 10 +++++----- uni_modules/uni-id-cf/changelog.md | 2 ++ uni_modules/uni-id-cf/package.json | 2 +- .../uniCloud/cloudfunctions/uni-id-cf/index.js | 6 ++---- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/changelog.md b/changelog.md index e7726a38..7c0bb03c 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 2a512be4..5e4615b9 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 28b42c7d..be5be28c 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 85cbe3b7..34213445 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 003b54b0..4e835c06 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 3ffcb281..7c286ee1 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 3ae366f2..3169f8b4 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) -- GitLab