更新uni-id-pages

.gitignore

@@ -9,3 +9,4 @@ package-lock.json
 /manifest.json
 /env.js
 /vue.config.js
+/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/captcha-config/

uni_modules/uni-badge/components/uni-badge/uni-badge.vue

@@ -192,12 +192,11 @@
 		display: flex;
 		overflow: hidden;
 		box-sizing: border-box;
-		min-width: 20px;
-		font-feature-settings: "tnum";
 		/* #endif */
 		justify-content: center;
 		flex-direction: row;
 		height: 20px;
+		min-width: 20px;
 		padding: 0 4px;
 		line-height: 18px;
 		color: #fff;
@@ -207,6 +206,7 @@
 		border: 1px solid #fff;
 		text-align: center;
 		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		font-feature-settings: "tnum";
 		font-size: $bage-size;
 		/* #ifdef H5 */
 		z-index: 999;

uni_modules/uni-id-pages/changelog.md

+## 1.0.40（2023-01-16）
+- 更新依赖的 验证码插件`uni-captcha`版本的版本为 0.6.4 修复 部分情况下APP端无法获取验证码的问题 [详情参考](https://ext.dcloud.net.cn/plugin?id=4048)
+- 修复 客户端token过期后，点击退出登录按钮报错的问题
+- uni-id-co 修复 updateUser 接口`手机号`和`邮箱`参数值为空字符串时，修改无效的问题
 ## 1.0.39（2022-12-28）
 - uni-id-co 修复 URL化时第三方登录无法获取 uniPlatform 参数
 - uni-id-co 修复 validator error

uni_modules/uni-id-pages/common/store.js

@@ -62,7 +62,14 @@ export const mutations = {
 		return data
 	},
 	async logout() {
+		// 1. 已经过期就不需要调用服务端的注销接口	2.即使调用注销接口失败，不能阻塞客户端
+		if(uniCloud.getCurrentUserInfo().tokenExpired > Date.now()){
+			try{
 				await uniIdCo.logout()
+			}catch(e){
+				console.error(e);
+			}
+		}
 		uni.removeStorageSync('uni_id_token');
 		uni.setStorageSync('uni_id_token_expired', 0)
 		uni.redirectTo({

uni_modules/uni-id-pages/package.json

 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.0.39",
+	"version": "1.0.40",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",

uni_modules/uni-id-pages/pages/login/login-withpwd.vue

@@ -96,7 +96,6 @@
 						duration: 3000
 					});
 				}
-				console.log("this.needCaptcha: ",this.needCaptcha);
 				if (this.needCaptcha && this.captcha.length != 4) {
 					this.$refs.captcha.getImageCaptcha()
 					return uni.showToast({

uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue

@@ -56,7 +56,6 @@
 						duration: 3000
 					});
 				}
-				console.log("this.formData.code: ",this.formData.code);
 				if(! /^\d{6}$/.test(this.formData.code)){
 					this.$refs.smsForm.focusSmsCodeInput = true 
 					return uni.showToast({
@@ -85,7 +84,7 @@
 					uni.navigateBack()
 					return e
 				}).catch(e => {
-					console.log(e);
+					console.log(e,"bindMobileBySms++++++++++");
 					if (e.errCode == 'uni-id-captcha-required') {
 						this.$refs.popup.open()
 					}

uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue

@@ -94,7 +94,7 @@
 								oldPassword,
 								newPassword
 							}).then(e => {
-								// console.log(e);
+								console.log("e:------------- ",e);
 								uni.removeStorageSync('uni_id_token');
 								uni.setStorageSync('uni_id_token_expired', 0)
 								uni.redirectTo({
@@ -102,16 +102,14 @@
 								})
 								return e
 							}).catch(e => {
-								console.log("e:------------ ",e);
-								// uni.showModal({
-								// 	content: e.message,
-								// 	showCancel: false
-								// });
+								uni.showModal({
+									content: e.message,
+									showCancel: false
+								});
 								return e
 							})
-						
 					}).catch(errors => {
-						console.log("errors: ------------",errors);
+						console.log("errors: ",errors);
 						let key = errors[0].key
 						key = key.replace(key[0], key[0].toUpperCase())
 						// console.log(key, 'focus' + key);

uni_modules/uni-id-pages/pages/userinfo/userinfo.vue

@@ -57,8 +57,8 @@
 				// 	mobile:'',
 				// 	nickname:''
 				// },
-				hasPwd: false,
-				showLoginManage: false //通过页面传参隐藏登录&退出登录按钮
+				hasPwd:false,
+				showLoginManage:false//通过页面传参隐藏登录&退出登录按钮
 			}
 		},
 		async onShow() {
@@ -66,9 +66,8 @@
 			this.univerifyStyle.otherLoginButton.title = "其他号码绑定"
 		},
 		async onLoad(e) {
-			console.log("store.userInfo:---- ",store.userInfo);
-			if (e.showLoginManage) {
-				this.showLoginManage = true //通过页面传参隐藏登录&退出登录按钮
+			if(e.showLoginManage){
+				this.showLoginManage = true//通过页面传参隐藏登录&退出登录按钮
 			}
 			//判断当前用户是否有密码，否则就不显示密码修改功能
 			let res = await uniIdCo.getAccountInfo()
@@ -83,13 +82,13 @@
 					}
 				})
 			},
-			logout() {
+      logout(){
         mutations.logout()
       },
-			bindMobileSuccess() {
+      bindMobileSuccess(){
         mutations.updateUserInfo()
       },
-			changePassword() {
+			changePassword(){
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd',
 					complete: (e) => {
@@ -157,9 +156,9 @@
 					this.$refs.dialog.open()
 				}
 			},
-			deactivate() {
+			deactivate(){
 				uni.navigateTo({
-					url: "/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
+					url:"/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
 				})
 			},
 			async bindThirdAccount(provider) {
@@ -199,6 +198,7 @@
 	}
 </script>
 <style lang="scss" scoped>
+
 	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
 
 	.uni-content {
@@ -211,7 +211,6 @@
 		box-sizing: border-box;
 		flex-direction: column;
 	}
-
 	@media screen and (min-width: 690px) {
 		.uni-content {
 			padding: 0;
@@ -223,7 +222,6 @@
 			box-shadow: none;
 		}
 	}
-
 	/* #endif */
 	.avatar {
 		align-items: center;
@@ -247,7 +245,7 @@
 		width: 80%;
 	}
 
-	.mt10 {
+	.mt10{
 		margin-top: 10px;
 	}
 </style>

uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json

@@ -330,15 +330,6 @@
 			},
 			"title": "角色"
 		},
-		"tags":{
-			"bsonType": "array",
-			"description": "用户标签",
-			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
-				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
-			},
-			"title": "标签"
-		},
 		"score": {
 			"bsonType": "int",
 			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
@@ -378,7 +369,7 @@
 			"bsonType": "array",
 			"description": "用户token",
 			"permission": {
-				"read": false,
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
 				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},