- 优化登陆体验，账号密码登陆错误超过2次，再显示图形验证码进行人机校验。

2e36e6ba · DCloud_JSON · study夏羽 · 4e3ad9cf · 2e36e6ba · 2e36e6ba
8 changed file
--- a/changelog.md
+++ b/changelog.md
+## 1.2.2（2022-05-19）
+- 优化登陆体验，账号密码登陆错误超过2次，再显示图形验证码进行人机校验。
 ## 1.2.1（2022-05-18）
 - 修复在某些情况下，微信小程序端验证码显示错误的问题
 ## 1.2.0（2022-05-16）

--- a/manifest.json
+++ b/manifest.json
 {
-    "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" : [
+  "name": "",
+  "appid": "请点击重新获取",
+  "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\"/>",
@@ -78,136 +86,156 @@
          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
        ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+        "abiFilters": [
+          "armeabi-v7a",
+          "arm64-v8a",
+          "x86"
+        ]
      },
-            "ios" : {
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com" ]
+      "ios": {
+        "capabilities": {
+          "entitlements": {
+            "com.apple.developer.associated-domains": [
+              "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com"
+            ]
          }
        }
      },
-            "sdkConfigs" : {
-                "oauth" : {
-                    "apple" : {},
-                    "weixin" : {
-                        "appid" : "",
-                        "appsecret" : "",
-                        "UniversalLinks" : ""
+      "sdkConfigs": {
+        "oauth": {
+          "apple": {
          },
-                    "univerify" : {}
+          "weixin": {
+            "appid": "",
+            "appsecret": "",
+            "UniversalLinks": ""
          },
-                "ad" : {},
-                "share" : {
-                    "weixin" : {
-                        "appid" : "",
-                        "UniversalLinks" : ""
+          "univerify": {
          }
        },
-                "geolocation" : {
-                    "baidu" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "请填写地图的key",
-                        "appkey_android" : "请填写地图的key"
+        "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" : {}
+        "push": {
+          "unipush": {
+            "version": "2",
+            "offline": true,
+            "meizu": {
+            },
+            "mi": {
+            },
+            "vivo": {
+            },
+            "oppo": {
+            },
+            "hms": {
            }
+          }
+        },
+        "payment": {
        },
-                "payment" : {},
-                "maps" : {}
+        "maps": {
+        }
      },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "",
-                    "xhdpi" : "",
-                    "xxhdpi" : "",
-                    "xxxhdpi" : ""
+      "icons": {
+        "android": {
+          "hdpi": "",
+          "xhdpi": "",
+          "xxhdpi": "",
+          "xxxhdpi": ""
        },
-                "ios" : {
-                    "appstore" : "",
-                    "ipad" : {
-                        "app" : "",
-                        "app@2x" : "",
-                        "notification" : "",
-                        "notification@2x" : "",
-                        "proapp@2x" : "",
-                        "settings" : "",
-                        "settings@2x" : "",
-                        "spotlight" : "",
-                        "spotlight@2x" : ""
+        "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" : ""
+          "iphone": {
+            "app@2x": "",
+            "app@3x": "",
+            "notification@2x": "",
+            "notification@3x": "",
+            "settings@2x": "",
+            "settings@3x": "",
+            "spotlight@2x": "",
+            "spotlight@3x": ""
          }
        }
      },
-            "splashscreen" : {
-                "iosStyle" : "common",
-                "androidStyle" : "common",
-                "useOriginalMsgbox" : true
+      "splashscreen": {
+        "iosStyle": "common",
+        "androidStyle": "common",
+        "useOriginalMsgbox": true
      }
    },
-        "nvueLaunchMode" : ""
+    "nvueLaunchMode": ""
+  },
+  "quickapp": {
  },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : false
+  "mp-weixin": {
+    "appid": "",
+    "setting": {
+      "urlCheck": false,
+      "es6": false
    },
-        "usingComponents" : true,
-        "betterScopedSlots" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "演示在onShow生命周期获取地理位置"
+    "usingComponents": true,
+    "betterScopedSlots": true,
+    "permission": {
+      "scope.userLocation": {
+        "desc": "演示在onShow生命周期获取地理位置"
      }
    }
  },
-    "mp-alipay" : {
-        "usingComponents" : true
+  "mp-alipay": {
+    "usingComponents": true
  },
-    "mp-baidu" : {
-        "usingComponents" : true
+  "mp-baidu": {
+    "usingComponents": true
  },
-    "mp-toutiao" : {
-        "usingComponents" : true
+  "mp-toutiao": {
+    "usingComponents": true
  },
-    "uniStatistics" : {
-        "enable" : false
+  "uniStatistics": {
+    "enable": false
  },
-    "h5" : {
-        "template" : "",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : ""
+  "h5": {
+    "template": "",
+    "sdkConfigs": {
+      "maps": {
+        "qqmap": {
+          "key": ""
        }
      }
    },
-        "router" : {
-            "base" : ""
+    "router": {
+      "base": ""
    },
-        "uniStatistics" : {
-            "enable" : true
+    "uniStatistics": {
+      "enable": true
    }
  },
-    "_spaceID" : "",
-    "vueVersion" : "2"
+  "_spaceID": "",
+  "vueVersion": "2"
 }
\ No newline at end of file
--- a/package.json
+++ b/package.json
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"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 scene="login" v-model="captcha"></uni-captcha>
+		<uni-captcha v-if="needCaptcha" 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>
@@ -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
 								});
 							}
 						}

--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
+## 0.5.2（2022-05-19）
+- 修复在Vue3的兼容问题
 ## 0.5.1（2022-05-18）
 - 修复在某些情况下微信小程序端验证码显示错误的问题
 ## 0.5.0（2022-05-17）

--- 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"></image>
 		</view>
 		<input @blur="focusCaptchaInput = false" :focus="focusCaptchaInput" type="text" class="captcha"
-			:inputBorder="false" maxlength="4" v-model="modelValue" placeholder="请输入验证码">
+			:inputBorder="false" maxlength="4" v-model="val" placeholder="请输入验证码">
 	</view>
 </template>

 <script>
 	export default {
-		data() {
-			return {
-				focusCaptchaInput: false,
-				modelValue: "",
-				captchaBase64: "",
-				loging: false
-			};
-		},
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
 		props: {
-			event: 'update:modelValue',
+			modelValue:String,
+			value:String,
 			scene: {
 				type: String,
 				default () {
@@ -39,13 +28,33 @@
 				}
 			}
 		},
-		watch: {
-			modelValue(value) {
+		computed:{
+			val:{
+				get(){
+					return this.value||this.modelValue
+				},
+				set(value){
+					// console.log(value);
 					// TODO 兼容 vue2
+					// #ifdef VUE2
 					this.$emit('input', value);
+					// #endif
+					
 					// TODO　兼容　vue3
+					// #ifdef VUE3
 					this.$emit('update:modelValue', value)
+					// #endif
+				}
+			}
 		},
+		data() {
+			return {
+				focusCaptchaInput: false,
+				captchaBase64: "",
+				loging: false
+			};
+		},
+		watch: {
 			scene: {
 				handler(scene) {
 					if (scene) {
@@ -63,8 +72,8 @@
 		methods: {
 			getImageCaptcha(focus = true) {
 				this.loging = true
-				this.modelValue = ''
 				if (focus) {
+					this.val = ''
 					this.focusCaptchaInput = true
 				}
 				const uniIdCo = uniCloud.importObject("uni-captcha-co", {
@@ -111,6 +120,16 @@
 		background-color: #FEFAE7;
 	}

+	.captcha {
+		height: 44px;
+		line-height: 44px;
+	}
+
+	.captcha-img-box {
+		position: relative;
+		background-color: #FEFAE7;
+	}
+
 	.captcha {
 		background-color: #F8F8F8;
 		font-size: 14px;

--- 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 @@
 		<view class="popup-captcha">
 			<view class="content">
 				<text class="title">{{title}}</text>
-				<uni-captcha :scene="scene" v-model="modelValue"></uni-captcha>
+				<uni-captcha :scene="scene" v-model="val"></uni-captcha>
 			</view>
 			<view class="button-box">
 				<view @click="close" class="btn">取消</view>
@@ -15,17 +15,9 @@

 <script>
 	export default {
-		data() {
-			return {
-				modelValue: "",
-			};
-		},
-		model: {
-			prop: 'modelValue',
-			event: 'update:modelValue'
-		},
 		props: {
-			event: 'update:modelValue',
+			modelValue:String,
+			value:String,
 			scene: {
 				type: String,
 				default () {
@@ -39,12 +31,23 @@
 				}
 			},
 		},
-		watch: {
-			modelValue(value) {
+		computed:{
+			val:{
+				get(){
+					return this.value||this.modelValue
+				},
+				set(value){
+					// console.log(value);
 					// TODO 兼容 vue2
+					// #ifdef VUE2
 					this.$emit('input', value);
+					// #endif
+					
 					// TODO　兼容　vue3
+					// #ifdef VUE3
 					this.$emit('update:modelValue', value)
+					// #endif
+				}
 			}
 		},
 		methods: {
@@ -55,7 +58,7 @@
 				this.$refs.popup.close()
 			},
 			confirm() {
-				if(this.modelValue.length < 4){
+				if(this.val.length < 4){
 					return uni.showToast({
 						title: '请填写验证码',
 						icon: 'none'

--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
 {
  "id": "uni-captcha",
  "displayName": "uni-captcha",
-  "version": "0.5.1",
+  "version": "0.5.2",
  "description": "云端一体图形验证码组件",
  "keywords": [
    "uniCloud",