diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md index 031c0c29b168939a5395946a3b2bfd1044ca85d5..6c1de4efc08319ba4926a2d4a77a934c28beecc3 100644 --- a/uni_modules/uni-id-pages/changelog.md +++ b/uni_modules/uni-id-pages/changelog.md @@ -1,3 +1,5 @@ +## 1.1.13(2023-05-10) +- 修复 启用摇树优化 报错的问题 ## 1.1.12(2023-05-05) - uni-id-co 新增 调用 add-user 接口创建用户时允许触发 beforeRegister 钩子方法,beforeRegister 钩子[详见](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html#before-register) - uni-id-co 新增 自无 unionid 到有 unionid 状态进行登录时为用户补充 unionid 字段 diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue index f6390f78e1ecc34409a84e42aedca98340328b2f..913f4435b33f4a43fc1d3ffe747036cfe831fdc4 100644 --- a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue +++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue @@ -202,7 +202,6 @@ return '/' + pages[pages.length - n].route }, toPage(path,index = 0) { - let type = ['navigateTo','redirectTo'][index] //console.log('比较', this.getRoute(1),this.getRoute(2), path) if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) == '/uni_modules/uni-id-pages/pages/login/login-withoutpwd') { @@ -212,13 +211,23 @@ } else if (this.getRoute(2) == path) { // 如果上一个页面就是,马上要打开的页面,直接返回。防止重复开启 uni.navigateBack(); } else if (this.getRoute(1) != path) { - uni[type]({ - url: path, - animationType: 'slide-in-left', - complete(e) { - // console.log(e); - } - }) + if(index === 0){ + uni.navigateTo({ + url: path, + animationType: 'slide-in-left', + complete(e) { + // console.log(e); + } + }) + }else{ + uni.redirectTo({ + url: path, + animationType: 'slide-in-left', + complete(e) { + // console.log(e); + } + }) + } } else { console.log('出乎意料的情况,path:' + path); } diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json index 21d6ae708bd29043173dfb956c0220f49ae24fd1..2d9945a0d26cf2ef579cca13ea84f02c6eccac99 100644 --- a/uni_modules/uni-id-pages/package.json +++ b/uni_modules/uni-id-pages/package.json @@ -1,7 +1,7 @@ { "id": "uni-id-pages", "displayName": "uni-id-pages", - "version": "1.1.12", + "version": "1.1.13", "description": "云端一体简单、统一、可扩展的用户中心页面模版", "keywords": [ "用户管理",