Merge pull request #2326 from didi/fix-onload-params-codetype

拉齐各端onload的返回结果

Author: hiyuki

packages/core/src/platform/builtInMixins/pageStatusMixin.js

@@ -1,4 +1,5 @@
 import { CREATED, ONLOAD, ONSHOW, ONHIDE, ONRESIZE } from '../../core/innerLifecycle'
+import { isObject } from '@mpxjs/utils'
 
 export default function pageStatusMixin (mixinType) {
   if (mixinType === 'page') {
@@ -13,7 +14,18 @@ export default function pageStatusMixin (mixinType) {
         this.__mpxProxy.callHook(ONRESIZE, [e])
       },
       onLoad (query) {
-        this.__mpxProxy.callHook(ONLOAD, [query])
+        if (__mpx_mode__ === 'wx') {
+          const loadParams = {}
+          // 此处单独处理微信与其他端保持一致，传入onload的参数都是经过decodeURIComponent处理过的
+          if (isObject(query)) {
+            for (const key in query) {
+              loadParams[key] = decodeURIComponent(query[key])
+            }
+          }
+          this.__mpxProxy.callHook(ONLOAD, [loadParams])
+        } else {
+          this.__mpxProxy.callHook(ONLOAD, [query])
+        }
       }
     }
     if (__mpx_mode__ === 'ali') {

packages/core/src/platform/patch/getDefaultOptions.ios.js

@@ -314,14 +314,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
 
   if (type === 'page') {
     const props = propsRef.current
-    const loadParams = {}
-    // 此处拿到的props.route.params内属性的value被进行过了一次decode, 不符合预期，此处额外进行一次encode来与微信对齐
-    if (isObject(props.route.params)) {
-      for (const key in props.route.params) {
-        loadParams[key] = encodeURIComponent(props.route.params[key])
-      }
-    }
-    proxy.callHook(ONLOAD, [loadParams])
+    proxy.callHook(ONLOAD, [props.route.params || {}])
   }
 
   Object.assign(proxy, {