From 2e36e6baad7923224d39ac5ed7463c724577aa71 Mon Sep 17 00:00:00 2001 From: linju Date: Thu, 19 May 2022 00:59:14 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=E7=99=BB=E9=99=86?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=EF=BC=8C=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=99=BB=E9=99=86=E9=94=99=E8=AF=AF=E8=B6=85=E8=BF=872?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E5=86=8D=E6=98=BE=E7=A4=BA=E5=9B=BE=E5=BD=A2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=BF=9B=E8=A1=8C=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 2 + manifest.json | 418 ++++++++++-------- package.json | 2 +- .../login-page/pwd-login/pwd-login.vue | 47 +- uni_modules/uni-captcha/changelog.md | 2 + .../components/uni-captcha/uni-captcha.vue | 61 ++- .../uni-popup-captcha/uni-popup-captcha.vue | 39 +- uni_modules/uni-captcha/package.json | 2 +- 8 files changed, 296 insertions(+), 277 deletions(-) diff --git a/changelog.md b/changelog.md index 02695265..629c9bd0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,5 @@ +## 1.2.2（2022-05-19） +- 优化登陆体验，账号密码登陆错误超过2次，再显示图形验证码进行人机校验。 ## 1.2.1（2022-05-18） - 修复在某些情况下，微信小程序端验证码显示错误的问题 ## 1.2.0（2022-05-16） diff --git a/manifest.json b/manifest.json index 15cc4147..13ba2f7d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,213 +1,241 @@ { - "name" : "uni-starter-old", - "appid" : "__UNI__EC87F46", - "description" : "云端一体应用快速开发模版", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - "app-plus" : { - "locales" : { - "en" : { - "name" : "uni-starter", - "android" : { - "strings" : { - "CustomKey" : "CustomValue" - } - }, - "ios" : { - "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "access to the user’s photo library(read)" - }, - "infoPlist" : { - "CustomKey" : "CustomValue" - } - } - }, - "zh" : { - "name" : "统一应用基本项目" - } + "name": "", + "appid": "请点击重新获取", + "description": "云端一体应用快速开发模版", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "app-plus": { + "locales": { + "en": { + "name": "uni-starter", + "android": { + "strings": { + "CustomKey": "CustomValue" + } }, - "privacy" : { - "prompt" : "template", - "template" : { - "title" : "服务协议和隐私政策", - "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", - "buttonAccept" : "同意", - "buttonRefuse" : "暂不同意" - } + "ios": { + "privacyDescription": { + "NSPhotoLibraryUsageDescription": "access to the user’s photo library(read)" + }, + "infoPlist": { + "CustomKey": "CustomValue" + } + } + }, + "zh": { + "name": "统一应用基本项目" + } + }, + "privacy": { + "prompt": "template", + "template": { + "title": "服务协议和隐私政策", + "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept": "同意", + "buttonRefuse": "暂不同意" + } + }, + "compatible": { + "ignoreVersion": true + }, + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": false, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "modules": { + "Fingerprint": { + }, + "Share": { + }, + "OAuth": { + }, + "FaceID": { + }, + "Geolocation": { + }, + "Bluetooth": { + }, + "Push": { + }, + "Maps": { + } + }, + "distribute": { + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters": [ + "armeabi-v7a", + "arm64-v8a", + "x86" + ] + }, + "ios": { + "capabilities": { + "entitlements": { + "com.apple.developer.associated-domains": [ + "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com" + ] + } + } + }, + "sdkConfigs": { + "oauth": { + "apple": { + }, + "weixin": { + "appid": "", + "appsecret": "", + "UniversalLinks": "" + }, + "univerify": { + } }, - "compatible" : { - "ignoreVersion" : true + "ad": { }, - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : false, - "waiting" : true, - "autoclose" : true, - "delay" : 0 + "share": { + "weixin": { + "appid": "", + "UniversalLinks": "" + } }, - "modules" : { - "Fingerprint" : {}, - "Share" : {}, - "OAuth" : {}, - "FaceID" : {}, - "Geolocation" : {}, - "Bluetooth" : {}, - "Push" : {}, - "Maps" : {} + "geolocation": { + "baidu": { + "__platform__": [ + "ios", + "android" + ], + "appkey_ios": "请填写地图的key", + "appkey_android": "请填写地图的key" + } }, - "distribute" : { - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + "push": { + "unipush": { + "version": "2", + "offline": true, + "meizu": { }, - "ios" : { - "capabilities" : { - "entitlements" : { - "com.apple.developer.associated-domains" : [ "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com" ] - } - } + "mi": { }, - "sdkConfigs" : { - "oauth" : { - "apple" : {}, - "weixin" : { - "appid" : "", - "appsecret" : "", - "UniversalLinks" : "" - }, - "univerify" : {} - }, - "ad" : {}, - "share" : { - "weixin" : { - "appid" : "", - "UniversalLinks" : "" - } - }, - "geolocation" : { - "baidu" : { - "__platform__" : [ "ios", "android" ], - "appkey_ios" : "请填写地图的key", - "appkey_android" : "请填写地图的key" - } - }, - "push" : { - "unipush" : { - "version" : "2", - "offline" : true, - "meizu" : {}, - "mi" : {}, - "vivo" : {}, - "oppo" : {}, - "hms" : {} - } - }, - "payment" : {}, - "maps" : {} + "vivo": { }, - "icons" : { - "android" : { - "hdpi" : "", - "xhdpi" : "", - "xxhdpi" : "", - "xxxhdpi" : "" - }, - "ios" : { - "appstore" : "", - "ipad" : { - "app" : "", - "app@2x" : "", - "notification" : "", - "notification@2x" : "", - "proapp@2x" : "", - "settings" : "", - "settings@2x" : "", - "spotlight" : "", - "spotlight@2x" : "" - }, - "iphone" : { - "app@2x" : "", - "app@3x" : "", - "notification@2x" : "", - "notification@3x" : "", - "settings@2x" : "", - "settings@3x" : "", - "spotlight@2x" : "", - "spotlight@3x" : "" - } - } + "oppo": { }, - "splashscreen" : { - "iosStyle" : "common", - "androidStyle" : "common", - "useOriginalMsgbox" : true + "hms": { } + } }, - "nvueLaunchMode" : "" - }, - "quickapp" : {}, - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false, - "es6" : false + "payment": { }, - "usingComponents" : true, - "betterScopedSlots" : true, - "permission" : { - "scope.userLocation" : { - "desc" : "演示在onShow生命周期获取地理位置" - } + "maps": { } + }, + "icons": { + "android": { + "hdpi": "", + "xhdpi": "", + "xxhdpi": "", + "xxxhdpi": "" + }, + "ios": { + "appstore": "", + "ipad": { + "app": "", + "app@2x": "", + "notification": "", + "notification@2x": "", + "proapp@2x": "", + "settings": "", + "settings@2x": "", + "spotlight": "", + "spotlight@2x": "" + }, + "iphone": { + "app@2x": "", + "app@3x": "", + "notification@2x": "", + "notification@3x": "", + "settings@2x": "", + "settings@3x": "", + "spotlight@2x": "", + "spotlight@3x": "" + } + } + }, + "splashscreen": { + "iosStyle": "common", + "androidStyle": "common", + "useOriginalMsgbox": true + } }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false + "nvueLaunchMode": "" + }, + "quickapp": { + }, + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false, + "es6": false }, - "h5" : { - "template" : "", - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "" - } - } - }, - "router" : { - "base" : "" - }, - "uniStatistics" : { - "enable" : true + "usingComponents": true, + "betterScopedSlots": true, + "permission": { + "scope.userLocation": { + "desc": "演示在onShow生命周期获取地理位置" + } + } + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "h5": { + "template": "", + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "" } + } + }, + "router": { + "base": "" }, - "_spaceID" : "", - "vueVersion" : "2" -} + "uniStatistics": { + "enable": true + } + }, + "_spaceID": "", + "vueVersion": "2" +} \ No newline at end of file diff --git a/package.json b/package.json index 308c1c05..5a3ba0d6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.2.1", + "version": "1.2.2", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue index 9f47f792..1a6152a2 100644 --- a/pages/ucenter/login-page/pwd-login/pwd-login.vue +++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue @@ -4,7 +4,7 @@ {{$t('pwdLogin.pwdLogin')}} - + @@ -26,7 +26,8 @@ "password": "", "username": "", "agree": false, - "captcha":false + "captcha":'', + "needCaptcha":false } }, computed: { @@ -61,44 +62,8 @@ icon: 'none' }); } - return await uniCloud.callFunction({ - name:'uni-id-cf', - data:{ - action:'login', - params:{ - "username": this.username, - "password": this.password, - "captcha":this.captcha - }, - }, - }).then(({result})=>{ - console.log("result:--------- ",result); - if (result.code === 0) { - this.loginSuccess(result) - } else { - if (result.needCaptcha) { - uni.showToast({ - title: result.msg||'完成', - icon: 'none' - }); - this.needCaptcha = true - // this.createCaptcha() - }else{ - uni.showModal({ - title: this.$t('common.error'), - content: result.msg, - showCancel: false, - confirmText: this.$t('common.gotIt') - }); - } - } - return result - }).catch((res)=>{ - console.log("res:-- ",res); - return res - }) // 下边是可以登录 - /* uniCloud.callFunction({ + uniCloud.callFunction({ name:'uni-id-cf', data:{ action:'login', @@ -122,10 +87,10 @@ // this.createCaptcha() }else{ uni.showModal({ - title: this.$t('common.error'), + title: this.$t('common').error, content: result.msg, showCancel: false, - confirmText: this.$t('common.gotIt') + confirmText: this.$t('common').gotIt }); } } diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md index 79d54b4f..5daf973f 100644 --- a/uni_modules/uni-captcha/changelog.md +++ b/uni_modules/uni-captcha/changelog.md @@ -1,3 +1,5 @@ +## 0.5.2（2022-05-19） +- 修复在Vue3的兼容问题 ## 0.5.1（2022-05-18） - 修复在某些情况下微信小程序端验证码显示错误的问题 ## 0.5.0（2022-05-17） diff --git a/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue index 5b3c6008..522ee8b4 100644 --- a/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue +++ b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue @@ -6,26 +6,15 @@ mode="widthFix"> + :inputBorder="false" maxlength="4" v-model="val" placeholder="请输入验证码">