diff --git a/changelog.md b/changelog.md index 629c9bd097d07b2ea4f47678ac5a3456fdd9b6eb..6a216ac6db9f721ab50b0e881d7791d4594ad7fd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,10 @@ +## 1.2.5(2022-05-29) +升级预置的`uni_modules`->`uni-captcha`版本为:0.6.0。[详情](https://ext.dcloud.net.cn/plugin?name=uni-captcha) +## 1.2.4(2022-05-20) +- 修改`uni-starter.config.js`->`debug`的默认值为`false` +## 1.2.3(2022-05-20) +- 默认关闭`manifest.json`中的扩展配置 +- `uni-starter.config.js` 新增debug,用于配置是否开启调试模式 ## 1.2.2(2022-05-19) - 优化登陆体验,账号密码登陆错误超过2次,再显示图形验证码进行人机校验。 ## 1.2.1(2022-05-18) diff --git a/common/appInit.js b/common/appInit.js index 24d50b28a7df8431b1a3f6a8a72133d19fb3d62b..3fc0e872d4174caaf103e507e2392439498b2080 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -200,7 +200,7 @@ export default async function() { }, fail(e) { // 失败回调拦截 console.error('网络请求错误码:',JSON.stringify(e)); - if (Debug) { + if (debug) { uni.showModal({ content: JSON.stringify(e), showCancel: false diff --git a/manifest.json b/manifest.json index 13ba2f7dd75d2fb142d30d731c80a9f59db3cd8f..8f82c59dd129eeb7205440cc020029c818a7a27f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,241 +1,72 @@ { - "name": "", - "appid": "请点击重新获取", - "description": "云端一体应用快速开发模版", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "locales": { - "en": { - "name": "uni-starter", - "android": { - "strings": { - "CustomKey": "CustomValue" - } + "name" : "uni-starter", + "appid" : "__UNI__EC87F46", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, - "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": { - } - }, - "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": { + /* 模块配置 */ + "modules" : {}, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] }, - "oppo": { - }, - "hms": { - } - } - }, - "payment": { - }, - "maps": { + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : {} } - }, - "icons": { - "android": { - "hdpi": "", - "xhdpi": "", - "xxhdpi": "", - "xxxhdpi": "" + }, + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false }, - "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 - } + "usingComponents" : true }, - "nvueLaunchMode": "" - }, - "quickapp": { - }, - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false, - "es6": false + "mp-alipay" : { + "usingComponents" : 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": "" - } - } + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true }, - "router": { - "base": "" + "uniStatistics" : { + "enable" : false }, - "uniStatistics": { - "enable": true - } - }, - "_spaceID": "", - "vueVersion": "2" -} \ No newline at end of file + "vueVersion" : "2" +} diff --git a/package.json b/package.json index 5a3ba0d6f172976b03bc78d7be3b56012a014e21..1d91d4b3f3c558fc8b0035c80670f923713c2fc9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.2.2", + "version": "1.2.5", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", @@ -39,7 +39,8 @@ }, "uni_modules": { "dependencies": [ - "uni-id-cf" + "uni-id-cf", + "uni-captcha" ], "encrypt": [], "platforms": { diff --git a/pages/list/list.nvue b/pages/list/list.nvue index 5df7408e3653f49657f184ff333c3120bbebe6ad..d2a4491ac3ef5b6ed5dbb24ab32cc2d9c06c38aa 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -103,7 +103,7 @@ } } }, - async onReady() { + async onReady() { // #ifdef APP-NVUE /* 可用窗口高度 - 搜索框高 - 状态栏高 */ this.listHight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50 + diff --git a/pages/ucenter/login-page/pwd-login/pwd-login.vue b/pages/ucenter/login-page/pwd-login/pwd-login.vue index 1a6152a2ad5fcf890d50e486ae1de9ff10030b07..1c45f3c93dfe6c6be4af87d0c2be8a1ee92a7c09 100644 --- a/pages/ucenter/login-page/pwd-login/pwd-login.vue +++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue @@ -87,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/pages/ucenter/login-page/register/register.vue b/pages/ucenter/login-page/register/register.vue index 21999e798b4987acec90b6f02a34262f232272e3..964223d30da54da91e2cee5696398ec2ad2b53f1 100644 --- a/pages/ucenter/login-page/register/register.vue +++ b/pages/ucenter/login-page/register/register.vue @@ -20,8 +20,7 @@ - + @@ -38,17 +37,15 @@ "nickname": "", "password":"", "pwd2":"", - "captcha":false + "captcha":"" }, rules, - agree: false, + agree:false, } }, - computed: { - canSubmit() { - /* return this.formData.username.length && this.formData.password.length && this.formData.captcha.length == - 4 && this.agree */ - return this.formData.username.length && this.formData.password.length && this.agree + computed:{ + canSubmit(){ + return this.formData.username.length && this.formData.password.length && this.formData.captcha.length == 4 && this.agree } }, onReady() { diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md index 5daf973fd19bb4479069b65f93df91150a76b486..703a268752ab4ae27973fe597e1e6bc75eff543d 100644 --- a/uni_modules/uni-captcha/changelog.md +++ b/uni_modules/uni-captcha/changelog.md @@ -1,3 +1,6 @@ +## 0.6.0(2022-05-27) +- 新增:支持在`uni-config-center`中根据场景值配置 +- 修复:弹窗式验证码,输入内容后点击取消,重新打开验证码的值仍然存在的问题 ## 0.5.2(2022-05-19) - 修复在Vue3的兼容问题 ## 0.5.1(2022-05-18) 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 522ee8b408ee5ba7e7a3fe62599fec6f291a13c5..dd8b8c4ed0879ac47e8db9ab7aa352940cda0e3d 100644 --- a/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue +++ b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.vue @@ -47,18 +47,11 @@ } } }, - data() { - return { - focusCaptchaInput: false, - captchaBase64: "", - loging: false - }; - }, watch: { scene: { handler(scene) { if (scene) { - this.getImageCaptcha(false) + this.getImageCaptcha(this.focus) } else { uni.showToast({ title: 'scene不能为空', diff --git a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue index 96299ee0651e5b15fb37b4534c1e2fbcf0d61a2b..64ec5b1bfec8d0d2bcd2ec627f910c783c815d63 100644 --- a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue +++ b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.vue @@ -3,7 +3,7 @@ {{title}} - + 取消 @@ -15,6 +15,11 @@