Skip to content

U
uview-ui
Unverified Commit 1e19e9df authored by Jay丶千珏's avatar Jay丶千珏 Committed by GitHub
Browse files
Options

fix(route.js):修复因为深度合并对象引起某些情况下不能跳转的问题 (#1267)

parent ec54e0e6
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
uview-ui/libs/function/route.js
View file @ 1e19e9df
...@@ -54,12 +54,12 @@ class Router { ...@@ -54,12 +54,12 @@ class Router {
mergeConfig.url = this.mixinParam(options, params) mergeConfig.url = this.mixinParam(options, params)
mergeConfig.type = 'navigateTo' mergeConfig.type = 'navigateTo'
} else { } else {
mergeConfig = uni.$u.deepMerge(options, this.config) mergeConfig = uni.$u.deepMerge(this.config, options)
// 否则正常使用mergeConfig中的url和params进行拼接 // 否则正常使用mergeConfig中的url和params进行拼接
mergeConfig.url = this.mixinParam(options.url, options.params) mergeConfig.url = this.mixinParam(options.url, options.params)
} }
if(params.intercept) { if (params.intercept) {
this.config.intercept = params.intercept this.config.intercept = params.intercept
} }
// params参数也带给拦截器 // params参数也带给拦截器
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment