diff --git a/pages.json b/pages.json index 2647e49b07ee5b17ab6282be44248184233d50e4..31dbc75bcb924b9090f08169026159b89544b9be 100644 --- a/pages.json +++ b/pages.json @@ -61,6 +61,7 @@ } }, + // #ifdef APP-PLUS { "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", "style": { @@ -76,7 +77,9 @@ } } - }, { + }, + // #endif + { "path": "pages/uni-agree/uni-agree", "style": { "navigationStyle": "custom", diff --git a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test.js b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test.js index 0ae8ab41610b4fd5dc4d5e6c6b8bf44a1b783312..a4cf05aa1cd4df338ef90e5a677d848e894473a2 100644 --- a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test.js +++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.test.js @@ -21,7 +21,7 @@ describe('uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue', mobile: "17769516019", code: "123456", captcha: "1234" - } + }, }) await page.waitFor(300) diff --git a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue index 38a43519efcae8de4a9348d7281a69c0a865ff4d..ab888ca44618b9f69589e1c60355100c38309a7c 100644 --- a/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue +++ b/uni_modules/uni-id-pages/pages/userinfo/bind-mobile/bind-mobile.vue @@ -68,7 +68,7 @@ // console.log(this.formData); const uniIdCo = uniCloud.importObject("uni-id-co") - uniIdCo.bindMobileBySms(this.formData).then(e => { + return await uniIdCo.bindMobileBySms(this.formData).then(e => { // console.log(e); uni.showToast({ title: e.errMsg, diff --git a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue index effe381c78f7100d50ca20aa54ed7380d53d67a9..0164c9d864bffc6c0d15bba10379be977cb911b9 100644 --- a/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue +++ b/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue @@ -81,16 +81,16 @@ /** * 完成并提交 */ - submit() { + async submit() { // console.log("formData", this.formData); // console.log('rules', this.rules); - this.$refs.form.validate() - .then(res => { + return await this.$refs.form.validate() + .then(async res => { let { oldPassword, newPassword } = this.formData - uniIdCo.updatePwd({ + return await uniIdCo.updatePwd({ oldPassword, newPassword }).then(e => { diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json index b581829d4377134f754266efb7c8964bd753fa9f..2dba58e018b1ffbf14bb572c0c6e56d1a1c5bb8a 100644 --- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json +++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json @@ -330,6 +330,15 @@ }, "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表定义", @@ -369,7 +378,7 @@ "bsonType": "array", "description": "用户token", "permission": { - "read": "'READ_UNI_ID_USERS' in auth.permission", + "read": false, "write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission" } }, @@ -379,7 +388,7 @@ "title": "用户名", "trim": "both", "permission": { - "read": true, + "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" } },