修复在某些情况下，微信小程序端验证码显示错误的问题

a20e4ac2 · DCloud_JSON · study夏羽 · 0135aa19 · a20e4ac2 · a20e4ac2
9 changed file
--- a/changelog.md
+++ b/changelog.md
+## 1.2.1（2022-05-18）
+- 修复在某些情况下，微信小程序端验证码显示错误的问题
 ## 1.2.0（2022-05-16）
 - 短信验证码登陆、绑定手机号码新增防刷逻辑。当短信验证码输入错误2次以上，弹出图形验证码进行人机校验。
 - uni-id-cf，新增防刷机制。更改loginLog为uniIdLog 记录各类uni-id操作，并新增action字段记录操作的行为名称

--- a/manifest.json
+++ b/manifest.json
 {
-  "name": "",
-  "appid": "",
-  "description": "",
-  "versionName": "",
-  "versionCode": "100",
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    "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" : "统一应用基本项目"
+            }
+        },
+        "privacy" : {
+            "prompt" : "template",
+            "template" : {
+                "title" : "服务协议和隐私政策",
+                "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ask.dcloud.net.cn/protocol.html\">《服务协议》</a>和<a href=\"https://ask.dcloud.net.cn/protocol.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+                "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" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "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" : {},
+                        "oppo" : {},
+                        "hms" : {}
+                    }
+                },
+                "payment" : {},
+                "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
+            }
+        },
+        "nvueLaunchMode" : ""
    },
-    "modules": {
-      "OAuth": {
-      }
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : false
+        },
+        "usingComponents" : true,
+        "betterScopedSlots" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "演示在onShow生命周期获取地理位置"
+            }
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
    },
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "ios": {
-      },
-      "sdkConfigs": {
-        "oauth": {
-          "univerify": {
-          }
+    "h5" : {
+        "template" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
+            }
+        },
+        "router" : {
+            "base" : ""
+        },
+        "uniStatistics" : {
+            "enable" : true
        }
-      }
-    }
-  },
-  "quickapp": {
-  },
-  "mp-weixin": {
-    "appid": "",
-    "setting": {
-      "urlCheck": false
    },
-    "usingComponents": true,
-    "permission": {
-      "scope.userLocation": {
-        "desc": "用于提供应用算法支持"
-      }
-    }
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "2"
+    "_spaceID" : "",
+    "vueVersion" : "2"
 }
--- a/package.json
+++ b/package.json
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
        "login",

--- a/pages/ucenter/login-page/pwd-login/pwd-login.vue
+++ b/pages/ucenter/login-page/pwd-login/pwd-login.vue
@@ -4,7 +4,7 @@
 		<text class="title">{{$t('pwdLogin.pwdLogin')}}</text>
 		<input class="input-box" :inputBorder="false" v-model="username" :placeholder="$t('pwdLogin.placeholder')"/>
 		<input type="password" class="input-box" :inputBorder="false" v-model="password" :placeholder="$t('pwdLogin.passwordPlaceholder')"/>
-		<uni-captcha v-if="needCaptcha" scene="login" v-model="captcha"></uni-captcha>
+		<uni-captcha scene="login" v-model="captcha"></uni-captcha>
 		<uni-agreements class="agreement" @setAgree="agree = $event"></uni-agreements>
 		<button class="send-btn" :disabled="!canLogin" :type="canLogin?'primary':'default'"
 			@click="pwdLogin">{{$t('pwdLogin.login')}}</button>
@@ -25,8 +25,8 @@
 			return {
 				"password": "",
 				"username": "",
-				"agree": false,
-				"captcha":'',
+				"agree": false,
+				"captcha":'',
 				"needCaptcha":false
 			}
 		},
@@ -59,40 +59,40 @@
 						icon: 'none'
 					});
 				}
-				// 下边是可以登录
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'login',
-						params:{
-							"username": this.username,
-							"password": this.password,
-							"captcha":this.captcha
-						},
-					},
-					success: ({result}) => {
-						console.log(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')
-								});
-							}
-						}
-					}
-				})
+				// 下边是可以登录
+				uniCloud.callFunction({
+					name:'uni-id-cf',
+					data:{
+						action:'login',
+						params:{
+							"username": this.username,
+							"password": this.password,
+							"captcha":this.captcha
+						},
+					},
+					success: ({result}) => {
+						console.log(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')
+								});
+							}
+						}
+					}
+				})
 			},
 			/* 前往注册 */
 			toRegister(e) {
@@ -125,8 +125,8 @@
 	.toRegister {
 		margin-top: 80px;
 		width: 600rpx;
-	}
-	.agreement{
-		margin-top: 10px;
+	}
+	.agreement{
+		margin-top: 10px;
 	}
 </style>
--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
@@ -26,5 +26,5 @@
 - 新增  支持设置字体大小
 - 新增  支持忽略某些字符
 - 注意  更新之后请重新上传公共模块
-## 0.1.0（2021-03-01）
- 调整为uni_modules目录规范
+## 0.1.0（2021-03-01）
+- 调整为uni_modules目录规范
--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
 {
  "id": "uni-captcha",
  "displayName": "uni-captcha",
-  "version": "0.6.0",
+  "version": "0.5.1",
  "description": "云端一体图形验证码组件",
  "keywords": [
    "uniCloud",

--- a/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/common/uni-captcha/index.js
--- a/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
@@ -24,9 +24,13 @@ module.exports = {
 		let action = res.data.length ? 'refresh' : 'create'
 		//执行并返回结果
 		//导入配置，配置优先级说明：此处配置 > uni-config-center
-		return await uniCaptcha[action]({
-			scene, //来源客户端传递，表示：使用场景值，用于防止不同功能的验证码混用
-			uniPlatform: platform
-		})
+		const config = require('./config')
+		return await uniCaptcha[action](Object.assign(
+			config, // 配置优先级说明：此配置 > uni-config-center
+			{
+				scene,//来源客户端传递，表示：使用场景值，用于防止不同功能的验证码混用
+				uniPlatform:platform
+			}, 
+		))
 	}
-}
+}
--- a/uni_modules/uni-captcha/uniCloud/database/db_init.json
+++ b/uni_modules/uni-captcha/uniCloud/database/db_init.json
+// 在本文件中可配置云数据库初始化，数据格式见：https://uniapp.dcloud.io/uniCloud/hellodb?id=db-init
+// 编写完毕后对本文件点右键，可按配置规则创建表和添加数据
+{
+	"opendb-verify-codes":{}
+}