diff --git a/uni_modules/uni-id-pages-x/pages/userinfo/deactivate/deactivate.uvue b/uni_modules/uni-id-pages-x/pages/userinfo/deactivate/deactivate.uvue index f40c66dafccf087e6f063be10f8531cafa0c9788..31589a4436ca00616ffb65923e446f0aa5224f1b 100644 --- a/uni_modules/uni-id-pages-x/pages/userinfo/deactivate/deactivate.uvue +++ b/uni_modules/uni-id-pages-x/pages/userinfo/deactivate/deactivate.uvue @@ -49,7 +49,7 @@ uni.removeStorageSync('uni_id_token'); uni.setStorageSync('uni_id_token_expired', 0) uni.navigateTo({ - url: "/uni_modules/uni-id-pages-x/pages/login/login-withoutpwd" + url: "/uni_modules/uni-id-pages-x/pages/login/login" }) }) } else { @@ -98,4 +98,4 @@ .button-group .btn.next { color: #0070ff; } - \ No newline at end of file + diff --git a/uni_modules/uni-id-pages-x/store.uts b/uni_modules/uni-id-pages-x/store.uts index 4e2150bb23bd2410dfca6f77cc9f03f7e7aecfd9..f0b257d55684cb0eab85b6c3aa3d60b5642e254c 100644 --- a/uni_modules/uni-id-pages-x/store.uts +++ b/uni_modules/uni-id-pages-x/store.uts @@ -24,7 +24,7 @@ function initState() { userInfo = new UTSJSONObject(userInfo) // #endif if (userInfo instanceof UTSJSONObject) { - state.userInfo = userInfo + state.userInfo = userInfo as UTSJSONObject // console.log('init userInfo',userInfo); } } catch (e) { @@ -45,40 +45,47 @@ export const mutations = { // console.log('afterUpdateUserInfo', state.userInfo); uni.setStorageSync('uni-id-pages-x-userInfo', state.userInfo) } - + const db = uniCloud.databaseForJQL() + const usersCollection = db.collection('uni-id-users') + const user_id = uniCloud.getCurrentUserInfo().uid + console.log('user_id', user_id); + if(user_id == null){ + return + } if (param == null) { - const db = uniCloud.databaseForJQL() - const user_id = uniCloud.getCurrentUserInfo().uid - console.log('user_id', user_id); - if (user_id != null) { - db.collection('uni-id-users') - .doc(user_id) - .field('_id,username,nickname,avatar_file,mobile') - .get() - .then(res => { - const uniIdCo = uniCloud.importObject('uni-id-co', { - customUI: true - }) - - uniIdCo - .getRealNameInfo() - .then((realNameInfo) => { - state.userInfo = Object.assign(res.data[0], { - realNameInfo - }) + usersCollection + .doc(user_id) + .field('_id,username,nickname,avatar_file,mobile') + .get() + .then(res => { + const uniIdCo = uniCloud.importObject('uni-id-co', { + customUI: true + }) - afterUpdateUserInfo() + uniIdCo + .getRealNameInfo() + .then((realNameInfo) => { + state.userInfo = Object.assign(res.data[0], { + realNameInfo }) + + afterUpdateUserInfo() }) - .catch((err: any | null) => { - const error = err as UniCloudError - console.error(error.errMsg, '错误') - }) - } + }) + .catch((err: any | null) => { + const error = err as UniCloudError + console.error(error.errMsg, '错误') + }) + } else { param.toMap().forEach((value, key) => { state.userInfo.set(key, value) }) + + usersCollection + .doc(user_id) + .update(param) + afterUpdateUserInfo() } }