Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !8

src/service/Api.js

@@ -88,8 +88,8 @@ export default class Api
         if (typeof data === "function") {
           data = await data()
         }
-        let curPid = data.pageId || "";
-        let prePid = data.prePageId || "";
+        let curPid = data?data.pageId:""|| "";
+        let prePid = data?data.prePageId:"" || "";
         //设置PAGEID
         headers["CUR-PID"] = curPid;
         headers["PRE-PID"] = prePid;